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
|
2
(6) |
3
(5) |
4
(1) |
5
(22) |
|
6
(2) |
7
|
8
|
9
(3) |
10
(1) |
11
(1) |
12
(3) |
|
13
|
14
(1) |
15
|
16
|
17
|
18
|
19
(1) |
|
20
(3) |
21
|
22
|
23
|
24
(2) |
25
|
26
(4) |
|
27
(21) |
28
(3) |
29
(1) |
30
|
31
|
|
|
|
From: <nil...@us...> - 2008-07-29 00:14:57
|
Revision: 1928
http://xoops.svn.sourceforge.net/xoops/?rev=1928&view=rev
Author: niluge_kiwi
Date: 2008-07-29 00:15:04 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
code cleaning
Modified Paths:
--------------
XoopsModules/mediawiki/branches/1.12/includes/Database.php
Modified: XoopsModules/mediawiki/branches/1.12/includes/Database.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/includes/Database.php 2008-07-28 23:59:14 UTC (rev 1927)
+++ XoopsModules/mediawiki/branches/1.12/includes/Database.php 2008-07-29 00:15:04 UTC (rev 1928)
@@ -746,14 +746,14 @@
# logging size most of the time. The substr is really just a sanity check.
# Who's been wasting my precious column space? -- TS
- #$profName = 'query: ' . $fname . ' ' . substr( mwDatabase::generalizeSQL( $sql ), 0, 255 );
+ #$profName = 'query: ' . $fname . ' ' . substr( Database::generalizeSQL( $sql ), 0, 255 );
if ( is_null( $this->getLBInfo( 'master' ) ) ) {
- $queryProf = 'query: ' . substr( mwDatabase::generalizeSQL( $sql ), 0, 255 );
- $totalProf = 'mwDatabase::query';
+ $queryProf = 'query: ' . substr( Database::generalizeSQL( $sql ), 0, 255 );
+ $totalProf = 'Database::query';
} else {
- $queryProf = 'query-m: ' . substr( mwDatabase::generalizeSQL( $sql ), 0, 255 );
- $totalProf = 'mwDatabase::query-master';
+ $queryProf = 'query-m: ' . substr( Database::generalizeSQL( $sql ), 0, 255 );
+ $totalProf = 'Database::query-master';
}
wfProfileIn( $totalProf );
wfProfileIn( $queryProf );
@@ -876,7 +876,7 @@
* & = filename; reads the file and inserts as a blob
* (we don't use this though...)
*/
- function prepare( $sql, $func = 'mwDatabase::prepare' ) {
+ function prepare( $sql, $func = 'Database::prepare' ) {
/* MySQL doesn't support prepared statements (yet), so just
pack up the query for reference. We'll manually replace
the bits later. */
@@ -909,7 +909,7 @@
* @param string $args ...
*/
function safeQuery( $query, $args = null ) {
- $prepared = $this->prepare( $query, 'mwDatabase::safeQuery' );
+ $prepared = $this->prepare( $query, 'Database::safeQuery' );
if( !is_array( $args ) ) {
# Pull the var args
$args = func_get_args();
@@ -1123,7 +1123,7 @@
* This function exists for historical reasons, Database::update() has a more standard
* calling convention and feature set
*/
- function set( $table, $var, $value, $cond, $fname = 'mwDatabase::set' )
+ function set( $table, $var, $value, $cond, $fname = 'Database::set' )
{
$table = $this->tableName( $table );
$sql = "UPDATE $table SET $var = '" .
@@ -1136,7 +1136,7 @@
* Usually aborts on failure
* If errors are explicitly ignored, returns FALSE on failure
*/
- function selectField( $table, $var, $cond='', $fname = 'mwDatabase::selectField', $options = array() ) {
+ function selectField( $table, $var, $cond='', $fname = 'Database::selectField', $options = array() ) {
if ( !is_array( $options ) ) {
$options = array( $options );
}
@@ -1220,7 +1220,7 @@
* see Database::makeSelectOptions code for list of supported stuff
* @return mixed Database result resource (feed to Database::fetchObject or whatever), or false on failure
*/
- function select( $table, $vars, $conds='', $fname = 'mwDatabase::select', $options = array() )
+ function select( $table, $vars, $conds='', $fname = 'Database::select', $options = array() )
{
if( is_array( $vars ) ) {
$vars = implode( ',', $vars );
@@ -1279,7 +1279,7 @@
*
* @todo migrate documentation to phpdocumentor format
*/
- function selectRow( $table, $vars, $conds, $fname = 'mwDatabase::selectRow', $options = array() ) {
+ function selectRow( $table, $vars, $conds, $fname = 'Database::selectRow', $options = array() ) {
$options['LIMIT'] = 1;
$res = $this->select( $table, $vars, $conds, $fname, $options );
if ( $res === false )
@@ -1300,7 +1300,7 @@
* Takes same arguments as Database::select()
*/
- function estimateRowCount( $table, $vars='*', $conds='', $fname = 'mwDatabase::estimateRowCount', $options = array() ) {
+ function estimateRowCount( $table, $vars='*', $conds='', $fname = 'Database::estimateRowCount', $options = array() ) {
$options['EXPLAIN']=true;
$res = $this->select ($table, $vars, $conds, $fname, $options );
if ( $res === false )
@@ -1353,7 +1353,7 @@
* Usually aborts on failure
* If errors are explicitly ignored, returns NULL on failure
*/
- function fieldExists( $table, $field, $fname = 'mwDatabase::fieldExists' ) {
+ function fieldExists( $table, $field, $fname = 'Database::fieldExists' ) {
$table = $this->tableName( $table );
$res = $this->query( 'DESCRIBE '.$table, $fname );
if ( !$res ) {
@@ -1376,7 +1376,7 @@
* Usually aborts on failure
* If errors are explicitly ignored, returns NULL on failure
*/
- function indexExists( $table, $index, $fname = 'mwDatabase::indexExists' ) {
+ function indexExists( $table, $index, $fname = 'Database::indexExists' ) {
$info = $this->indexInfo( $table, $index, $fname );
if ( is_null( $info ) ) {
return NULL;
@@ -1390,7 +1390,7 @@
* Get information about an index into an object
* Returns false if the index does not exist
*/
- function indexInfo( $table, $index, $fname = 'mwDatabase::indexInfo' ) {
+ function indexInfo( $table, $index, $fname = 'Database::indexInfo' ) {
# SHOW INDEX works in MySQL 3.23.58, but SHOW INDEXES does not.
# SHOW INDEX should work for 3.x and up:
# http://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
@@ -1478,7 +1478,7 @@
* Usually aborts on failure
* If errors are explicitly ignored, returns success
*/
- function insert( $table, $a, $fname = 'mwDatabase::insert', $options = array() ) {
+ function insert( $table, $a, $fname = 'Database::insert', $options = array() ) {
# No rows to insert, easy just return now
if ( !count( $a ) ) {
return true;
@@ -1546,7 +1546,7 @@
* more of IGNORE, LOW_PRIORITY
* @return bool
*/
- function update( $table, $values, $conds, $fname = 'mwDatabase::update', $options = array() ) {
+ function update( $table, $values, $conds, $fname = 'Database::update', $options = array() ) {
$table = $this->tableName( $table );
$opts = $this->makeUpdateOptions( $options );
$sql = "UPDATE $opts $table SET " . $this->makeList( $values, LIST_SET );
@@ -1567,7 +1567,7 @@
*/
function makeList( $a, $mode = LIST_COMMA ) {
if ( !is_array( $a ) ) {
- throw new DBUnexpectedError( $this, 'mwDatabase::makeList called with incorrect parameters' );
+ throw new DBUnexpectedError( $this, 'Database::makeList called with incorrect parameters' );
}
$first = true;
@@ -1767,7 +1767,7 @@
*
* @todo migrate comment to phodocumentor format
*/
- function replace( $table, $uniqueIndexes, $rows, $fname = 'mwDatabase::replace' ) {
+ function replace( $table, $uniqueIndexes, $rows, $fname = 'Database::replace' ) {
$table = $this->tableName( $table );
# Single row case
@@ -1803,9 +1803,9 @@
* @param string $joinVar The variable to join on, in the second table.
* @param array $conds Condition array of field names mapped to variables, ANDed together in the WHERE clause
*/
- function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = 'mwDatabase::deleteJoin' ) {
+ function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = 'Database::deleteJoin' ) {
if ( !$conds ) {
- throw new DBUnexpectedError( $this, 'mwDatabase::deleteJoin() called with empty $conds' );
+ throw new DBUnexpectedError( $this, 'Database::deleteJoin() called with empty $conds' );
}
$delTable = $this->tableName( $delTable );
@@ -1824,7 +1824,7 @@
function textFieldSize( $table, $field ) {
$table = $this->tableName( $table );
$sql = "SHOW COLUMNS FROM $table LIKE \"$field\";";
- $res = $this->query( $sql, 'mwDatabase::textFieldSize' );
+ $res = $this->query( $sql, 'Database::textFieldSize' );
$row = $this->fetchObject( $res );
$this->freeResult( $res );
@@ -1849,9 +1849,9 @@
*
* Use $conds == "*" to delete all rows
*/
- function delete( $table, $conds, $fname = 'mwDatabase::delete' ) {
+ function delete( $table, $conds, $fname = 'Database::delete' ) {
if ( !$conds ) {
- throw new DBUnexpectedError( $this, 'mwDatabase::delete() called with no conditions' );
+ throw new DBUnexpectedError( $this, 'Database::delete() called with no conditions' );
}
$table = $this->tableName( $table );
$sql = "DELETE FROM $table";
@@ -1868,7 +1868,7 @@
* $conds may be "*" to copy the whole table
* srcTable may be an array of tables.
*/
- function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'mwDatabase::insertSelect',
+ function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'Database::insertSelect',
$insertOptions = array(), $selectOptions = array() )
{
$destTable = $this->tableName( $destTable );
@@ -1950,7 +1950,7 @@
* reached.
*/
function deadlockLoop() {
- $myFname = 'mwDatabase::deadlockLoop';
+ $myFname = 'Database::deadlockLoop';
$this->begin();
$args = func_get_args();
@@ -1996,7 +1996,7 @@
* @param integer $timeout the maximum number of seconds to wait for synchronisation
*/
function masterPosWait( $file, $pos, $timeout ) {
- $fname = 'mwDatabase::masterPosWait';
+ $fname = 'Database::masterPosWait';
wfProfileIn( $fname );
@@ -2021,7 +2021,7 @@
* Get the position of the master from SHOW SLAVE STATUS
*/
function getSlavePos() {
- $res = $this->query( 'SHOW SLAVE STATUS', 'mwDatabase::getSlavePos' );
+ $res = $this->query( 'SHOW SLAVE STATUS', 'Database::getSlavePos' );
$row = $this->fetchObject( $res );
if ( $row ) {
return array( $row->Master_Log_File, $row->Read_Master_Log_Pos );
@@ -2034,7 +2034,7 @@
* Get the position of the master from SHOW MASTER STATUS
*/
function getMasterPos() {
- $res = $this->query( 'SHOW MASTER STATUS', 'mwDatabase::getMasterPos' );
+ $res = $this->query( 'SHOW MASTER STATUS', 'Database::getMasterPos' );
$row = $this->fetchObject( $res );
if ( $row ) {
return array( $row->File, $row->Position );
@@ -2046,7 +2046,7 @@
/**
* Begin a transaction, committing any previously open transaction
*/
- function begin( $fname = 'mwDatabase::begin' ) {
+ function begin( $fname = 'Database::begin' ) {
$this->query( 'BEGIN', $fname );
$this->mTrxLevel = 1;
}
@@ -2054,7 +2054,7 @@
/**
* End a transaction
*/
- function commit( $fname = 'mwDatabase::commit' ) {
+ function commit( $fname = 'Database::commit' ) {
$this->query( 'COMMIT', $fname );
$this->mTrxLevel = 0;
}
@@ -2063,7 +2063,7 @@
* Rollback a transaction.
* No-op on non-transactional databases.
*/
- function rollback( $fname = 'mwDatabase::rollback' ) {
+ function rollback( $fname = 'Database::rollback' ) {
$this->query( 'ROLLBACK', $fname, true );
$this->mTrxLevel = 0;
}
@@ -2072,7 +2072,7 @@
* Begin a transaction, committing any previously open transaction
* @deprecated use begin()
*/
- function immediateBegin( $fname = 'mwDatabase::immediateBegin' ) {
+ function immediateBegin( $fname = 'Database::immediateBegin' ) {
$this->begin();
}
@@ -2080,7 +2080,7 @@
* Commit transaction, if one is open
* @deprecated use commit()
*/
- function immediateCommit( $fname = 'mwDatabase::immediateCommit' ) {
+ function immediateCommit( $fname = 'Database::immediateCommit' ) {
$this->commit();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nil...@us...> - 2008-07-28 23:59:07
|
Revision: 1927
http://xoops.svn.sourceforge.net/xoops/?rev=1927&view=rev
Author: niluge_kiwi
Date: 2008-07-28 23:59:14 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
code cleaning
Modified Paths:
--------------
XoopsModules/mediawiki/branches/1.12/includes/AutoLoader.php
XoopsModules/mediawiki/branches/1.12/includes/Database.php
Modified: XoopsModules/mediawiki/branches/1.12/includes/AutoLoader.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/includes/AutoLoader.php 2008-07-28 17:31:22 UTC (rev 1926)
+++ XoopsModules/mediawiki/branches/1.12/includes/AutoLoader.php 2008-07-28 23:59:14 UTC (rev 1927)
@@ -42,8 +42,7 @@
'EnhancedChangesList' => 'includes/ChangesList.php',
'CoreParserFunctions' => 'includes/CoreParserFunctions.php',
'DBObject' => 'includes/Database.php',
- 'Database' => 'includes/Database.php',
- 'mwDatabase' => 'includes/Database.php',
+ 'mwDatabase' => 'includes/Database.php', // MediaWiki for Xoops, by Niluge_KiWi
'DatabaseMysql' => 'includes/Database.php',
'ResultWrapper' => 'includes/Database.php',
'DatabasePostgres' => 'includes/DatabasePostgres.php',
Modified: XoopsModules/mediawiki/branches/1.12/includes/Database.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/includes/Database.php 2008-07-28 17:31:22 UTC (rev 1926)
+++ XoopsModules/mediawiki/branches/1.12/includes/Database.php 2008-07-28 23:59:14 UTC (rev 1927)
@@ -512,13 +512,6 @@
return $this->$name;
}
-// Modified for mediawiki for XOOPS - by D.J.
- /* compatible with XOOPS */
- function Database( $server = false, $user = false, $password = false, $dbName = false,
- $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) {
- $this->mwDatabase( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix);
- }
-
#------------------------------------------------------------------------------
# Other functions
#------------------------------------------------------------------------------
@@ -533,11 +526,12 @@
* @param $flags
* @param $tablePrefix String: database table prefixes. By default use the prefix gave in LocalSettings.php
*/
+// apparently useless
// Modified for mediawiki for XOOPS - by D.J.
- function mwDatabase( $server = false, $user = false, $password = false, $dbName = false,
- $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) {
- $this->__construct( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix );
- }
+// function mwDatabase( $server = false, $user = false, $password = false, $dbName = false,
+// $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) {
+// $this->__construct( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix );
+// }
function __construct( $server = false, $user = false, $password = false, $dbName = false,
$failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) {
@@ -752,7 +746,7 @@
# logging size most of the time. The substr is really just a sanity check.
# Who's been wasting my precious column space? -- TS
- #$profName = 'query: ' . $fname . ' ' . substr( Database::generalizeSQL( $sql ), 0, 255 );
+ #$profName = 'query: ' . $fname . ' ' . substr( mwDatabase::generalizeSQL( $sql ), 0, 255 );
if ( is_null( $this->getLBInfo( 'master' ) ) ) {
$queryProf = 'query: ' . substr( mwDatabase::generalizeSQL( $sql ), 0, 255 );
@@ -1306,7 +1300,7 @@
* Takes same arguments as Database::select()
*/
- function estimateRowCount( $table, $vars='*', $conds='', $fname = 'Database::estimateRowCount', $options = array() ) {
+ function estimateRowCount( $table, $vars='*', $conds='', $fname = 'mwDatabase::estimateRowCount', $options = array() ) {
$options['EXPLAIN']=true;
$res = $this->select ($table, $vars, $conds, $fname, $options );
if ( $res === false )
@@ -2467,5 +2461,5 @@
}
}
+
endif;
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nil...@us...> - 2008-07-28 17:31:15
|
Revision: 1926
http://xoops.svn.sourceforge.net/xoops/?rev=1926&view=rev
Author: niluge_kiwi
Date: 2008-07-28 17:31:22 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
small bug corrected
Modified Paths:
--------------
XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php
XoopsModules/mediawiki/branches/1.12/templates/Xoops.php
Modified: XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php 2008-07-28 01:13:06 UTC (rev 1925)
+++ XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php 2008-07-28 17:31:22 UTC (rev 1926)
@@ -27,7 +27,7 @@
$wgExtensionCredits['other'][] = array(
"name" => "XoopsAuth",
- "author" => "Niluge_kiWi and phpp",
+ "author" => "Niluge_kiWi and phppp",
"version" => "1.0 - july 2008",
"url" => "http://dev.xoops.com",
"description" => "xoops auto authentification for 'mediawiki for xoops'"
Modified: XoopsModules/mediawiki/branches/1.12/templates/Xoops.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/templates/Xoops.php 2008-07-28 01:13:06 UTC (rev 1925)
+++ XoopsModules/mediawiki/branches/1.12/templates/Xoops.php 2008-07-28 17:31:22 UTC (rev 1926)
@@ -126,7 +126,7 @@
$printsheet = htmlspecialchars( "$wgStylePath/common/wikiprintable.css" );
$module_header .= "<link rel='stylesheet' type='text/css' $media href='$printsheet' />\n";
- $module_header .= $this->getHeadScripts();
+ $module_header .= $this->getHeadScripts(false); // maybe to set to true...
$module_header .= $out->mScripts;
$module_header .= $this->getUserStyles();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nil...@us...> - 2008-07-28 01:12:58
|
Revision: 1925
http://xoops.svn.sourceforge.net/xoops/?rev=1925&view=rev
Author: niluge_kiwi
Date: 2008-07-28 01:13:06 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
This time it's ok: install, update from 1.6.7 and 1.7.1, uninstall, main uses, all that works with xoops 2.0.18.1
Modified Paths:
--------------
XoopsModules/mediawiki/branches/1.12/LocalSettings.php
XoopsModules/mediawiki/branches/1.12/admin/update.mediawiki.php
XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php
Modified: XoopsModules/mediawiki/branches/1.12/LocalSettings.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/LocalSettings.php 2008-07-27 17:36:32 UTC (rev 1924)
+++ XoopsModules/mediawiki/branches/1.12/LocalSettings.php 2008-07-28 01:13:06 UTC (rev 1925)
@@ -64,6 +64,8 @@
$wgDisableOutputCompression = true;
$wgSitename = mediawiki_encoding_xoops2mediawiki($xoopsConfig["sitename"]);
+// Maybe to change...
+$wgLogo = XOOPS_URL."/modules/".MEDIAWIKI_DIRNAME."/images/mediawiki.png";
## The URL base path to the directory containing the wiki;
## defaults for all runtime URL paths are based off of this.
@@ -162,7 +164,7 @@
// mediawiki for xoops: Auto Authentification
require_once("extensions/XoopsAuth.php");
-$wgAuth = new AuthPlugin();
+$wgAuth = new XoopsAuth();
// mediawiki for xoops: FKCeditor: port from 1.7.1 to 1.12.0 not tested...
/* Installing this extension may lead to security and technical problems
Modified: XoopsModules/mediawiki/branches/1.12/admin/update.mediawiki.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/admin/update.mediawiki.php 2008-07-27 17:36:32 UTC (rev 1924)
+++ XoopsModules/mediawiki/branches/1.12/admin/update.mediawiki.php 2008-07-28 01:13:06 UTC (rev 1925)
@@ -55,7 +55,6 @@
require_once( "$IP/includes/Namespace.php" );
require_once( "$IP/includes/ProfilerStub.php" );
require_once( "$IP/includes/GlobalFunctions.php" );
-require_once( "$IP/includes/Hooks.php" );
require_once( "$IP/maintenance/updaters.inc" );
header("location: ".XOOPS_URL."/modules/system/admin.php?fct=modulesadmin");
@@ -71,6 +70,24 @@
chdir( ".." );
flush();
do_all_updates();
+
+ // tables not removed but useless:
+ // TODO: get the old module version with xoops framework to try to remove exactly what is needed
+ // (and still here after uninstall of mediawiki module, so we have to remove them now)
+ $tables_to_remove = array(
+ // update from 1.6.7
+ "validate",
+ // update from 1.7.1
+ "ipblocks_old"
+ );
+ foreach ($tables_to_remove as $table_name) {
+ if ( $wgDatabase->tableExists( $table_name ) ) {
+ $table_fullname = $wgDatabase->tableName( $table_name );
+ echo "Deleting $table_name...";
+ $wgDatabase->query( "DROP TABLE $table_fullname" );
+ }
+ }
+
chdir( "admin" );
xoops_cp_footer();
Modified: XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php 2008-07-27 17:36:32 UTC (rev 1924)
+++ XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php 2008-07-28 01:13:06 UTC (rev 1925)
@@ -41,7 +41,7 @@
var $instance;
- function AuthPlugin(){
+ function XoopsAuth(){
$this->instance = true;
$GLOBALS["wgHooks"]['AutoAuthenticate'][] = array(&$this, "AutoAuthenticate");
$GLOBALS["wgHooks"]['UserLogout'][] = array(&$this, "UserLogout");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nil...@us...> - 2008-07-27 17:36:23
|
Revision: 1924
http://xoops.svn.sourceforge.net/xoops/?rev=1924&view=rev
Author: niluge_kiwi
Date: 2008-07-27 17:36:32 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
forgot to commit this patch, now this should work
Modified Paths:
--------------
XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php
Modified: XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php
===================================================================
--- XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php 2008-07-27 14:22:14 UTC (rev 1923)
+++ XoopsModules/mediawiki/branches/1.12/extensions/XoopsAuth.php 2008-07-27 17:36:32 UTC (rev 1924)
@@ -48,7 +48,7 @@
}
function AutoAuthenticate(&$wgUser){
- $wgUser = new User::newFromSession();
+ $wgUser = User::newFromSession();
if ( is_object($GLOBALS["xoopsUser"]) ) {
$wgUser->mId = $GLOBALS["xoopsUser"]->getVar("uid");
$wgUser->mName = mediawiki_encoding_xoops2mediawiki($GLOBALS["xoopsUser"]->getVar("uname"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 14:22:09
|
Revision: 1923
http://xoops.svn.sourceforge.net/xoops/?rev=1923&view=rev
Author: phppp
Date: 2008-07-27 14:22:14 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Rollback commits from 2.3.1 branch. Will be re-committed once 2.3.0 final is released
Modified Paths:
--------------
XoopsCore/trunk/docs/changelog.txt
XoopsCore/trunk/htdocs/class/auth/auth.php
XoopsCore/trunk/htdocs/class/auth/auth_ads.php
XoopsCore/trunk/htdocs/class/auth/auth_ldap.php
XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php
XoopsCore/trunk/htdocs/class/auth/auth_xoops.php
XoopsCore/trunk/htdocs/class/auth/authfactory.php
XoopsCore/trunk/htdocs/include/registerform.php
XoopsCore/trunk/htdocs/install/language/english/finish.php
XoopsCore/trunk/htdocs/install/language/english/install.php
XoopsCore/trunk/htdocs/install/language/english/install2.php
XoopsCore/trunk/htdocs/install/language/english/welcome.php
XoopsCore/trunk/htdocs/install/makedata.php
XoopsCore/trunk/htdocs/install/page_dbsettings.php
XoopsCore/trunk/htdocs/install/page_modcheck.php
XoopsCore/trunk/htdocs/install/page_pathsettings.php
XoopsCore/trunk/htdocs/install/sql/mysql.data.sql
XoopsCore/trunk/htdocs/install/sql/mysql.structure.sql
XoopsCore/trunk/htdocs/lostpass.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/trunk/htdocs/register.php
Removed Paths:
-------------
XoopsCore/trunk/htdocs/class/auth/auth_soap.php
XoopsCore/trunk/htdocs/class/auth/auth_soap_provisionning.php
XoopsCore/trunk/htdocs/class/soap/
XoopsCore/trunk/htdocs/install/class/mainfilemanager.php
XoopsCore/trunk/htdocs/install/class/settingmanager.php
XoopsCore/trunk/htdocs/install/class/textsanitizer.php
XoopsCore/trunk/htdocs/install/img/bg_content_left.gif
XoopsCore/trunk/htdocs/install/img/bg_content_right.gif
XoopsCore/trunk/htdocs/install/img/bg_darkblue.gif
XoopsCore/trunk/htdocs/install/img/bg_table.gif
XoopsCore/trunk/htdocs/install/img/dummy.gif
XoopsCore/trunk/htdocs/install/img/hbar_installer_right.gif
XoopsCore/trunk/htdocs/install/img/hbar_left.gif
XoopsCore/trunk/htdocs/install/img/hbar_middle.gif
XoopsCore/trunk/htdocs/install/img/hbar_right.gif
XoopsCore/trunk/htdocs/install/img/logo.gif
XoopsCore/trunk/htdocs/install/img/no.gif
XoopsCore/trunk/htdocs/install/img/xoops2.gif
XoopsCore/trunk/htdocs/install/img/yes.gif
XoopsCore/trunk/htdocs/install/passwd.php
XoopsCore/trunk/htdocs/install/sql/upgrade/
Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt 2008-07-27 13:22:16 UTC (rev 1922)
+++ XoopsCore/trunk/docs/changelog.txt 2008-07-27 14:22:14 UTC (rev 1923)
@@ -1,36 +1,8 @@
XOOPS Changelog
-============================
-Version 2.3.0 RC - Branch 2.3.1 - Merger - Wishcraft
-============================
-Friday, 4 July 2008 3:47 AM
-
-- Tested 100% on http://auth.ess.io/
-- Lost Password Added
-- Completely Silent Soap Service Built
-- Few bug fixes with WSDL Handle
-- Several Rebuilds Due to the unusal nature of things.
-
-10:07 PM 19/05/2008
-
-- Soap Auth tested on X-SOAP 3.0.2 - Authed through chain sequence of 4 site including legacys systems in test. (wishcraft)
-- SiteInfo array created in auth system for unified registrarion (wishcraft)
-- Comments Added to AuthFactory Routines, Siteinfo array implemented
-- register.php modified to support array package
-- user.php - language, couple of states for passing around created ie.. _US_STATE_ONE (wishcraft).
-- AuthFactory Reduncancy - Soap, Active Directory, LDAP, set to try Xoops Auth if user state doesn't exist (wishcraft).
-- Soap Libraries Instanciated in class library (wishcraft)
-- function_exists & class_exists implemented in all classes and external functions (wishcraft)
-- register.php - refactory for the new authentication factory (wishcraft)
-- Authentication factory remodelled, to include soap authentication (wishcraft)
-- SOAP Language items added (wishcraft)
-
============================
-<<<<<<< .mine
-<<<<<<< .working
-=======
2008/07/26: Version 2.3.0 RC
============================
- Fixed bug #2011644 which Smarty cache path was wrongly configured, cleaned up deprecated paths (phppp/ad...@sf...)
@@ -59,43 +31,10 @@
============================
->>>>>>> .r1920
2008/04/18: Version 2.3.0 Alpha 3
-=======
-Version 2.3.0 - Branch 2.3.1 - Beta 1 - Wishcraft
->>>>>>> .merge-right.r1918
============================
-<<<<<<< .working
- Fixed bug #1954797: User can set session expiration to zero (phppp/Alex_Grey)
- Fixed bug #1941250: tags inside [code][/code] are rendered (phppp/Dona_Brasil)
-=======
-Friday, 4 July 2008 3:47 AM
-
-- Tested 100% on http://auth.ess.io/
-- Lost Password Added
-- Completely Silent Soap Service Built
-- Few bug fixes with WSDL Handle
-- Several Rebuilds Due to the unusal nature of things.
-
-10:07 PM 19/05/2008
-
-- Soap Auth tested on X-SOAP 3.0.2 - Authed through chain sequence of 4 site including legacys systems in test. (wishcraft)
-- SiteInfo array created in auth system for unified registrarion (wishcraft)
-- Comments Added to AuthFactory Routines, Siteinfo array implemented
-- register.php modified to support array package
-- user.php - language, couple of states for passing around created ie.. _US_STATE_ONE (wishcraft).
-- AuthFactory Reduncancy - Soap, Active Directory, LDAP, set to try Xoops Auth if user state doesn't exist (wishcraft).
-- Soap Libraries Instanciated in class library (wishcraft)
-- function_exists & class_exists implemented in all classes and external functions (wishcraft)
-- register.php - refactory for the new authentication factory (wishcraft)
-- Authentication factory remodelled, to include soap authentication (wishcraft)
-- SOAP Language items added (wishcraft)
-
-
-============================
-2008/04/18: Version 2.3.0 Beta 1
-============================
->>>>>>> .merge-right.r1918
- Fixed PHP4 compliance error (phppp/mamba/tzvook)
- Fixed reference related errors (phppp/marco)
- Fixed bug in CAPTCHA render: SESSION data were not registered for CAPTCHA triggered by logged in members (phppp/mamba)
Modified: XoopsCore/trunk/htdocs/class/auth/auth.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth.php 2008-07-27 13:22:16 UTC (rev 1922)
+++ XoopsCore/trunk/htdocs/class/auth/auth.php 2008-07-27 14:22:14 UTC (rev 1923)
@@ -32,7 +32,6 @@
* @author Pierre-Eric MENUET <pe...@fr...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
-
class XoopsAuth {
var $_dao;
@@ -54,86 +53,54 @@
return $authenticated;
}
- /**
- * add an error
- *
- * @param string $value error to add
- * @access public
- */
- function setErrors($err_no, $err_str)
- {
- $this->_errors[$err_no] = trim($err_str);
- }
+ /**
+ * add an error
+ *
+ * @param string $value error to add
+ * @access public
+ */
+ function setErrors($err_no, $err_str)
+ {
+ $this->_errors[$err_no] = trim($err_str);
+ }
- /**
- * return the errors for this object as an array
- *
- * @return array an array of errors
- * @access public
- */
- function getErrors()
- {
- return $this->_errors;
- }
+ /**
+ * return the errors for this object as an array
+ *
+ * @return array an array of errors
+ * @access public
+ */
+ function getErrors()
+ {
+ return $this->_errors;
+ }
- /**
- * return the errors for this object as html
- *
- * @return string html listing the errors
- * @access public
- */
- function getHtmlErrors()
- {
- global $xoopsConfig;
- $ret = '<br>';
- if ( $xoopsConfig['debug_mode'] == 1 || $xoopsConfig['debug_mode'] == 2 )
- {
- if (!empty($this->_errors)) {
- foreach ($this->_errors as $errno => $errstr) {
- $ret .= $errstr . '<br/>';
- }
- } else {
- $ret .= _NONE.'<br />';
- }
- $ret .= sprintf(_AUTH_MSG_AUTH_METHOD, $this->auth_method);
- }
- else {
- $ret .= _US_INCORRECTLOGIN;
- }
- return $ret;
- }
-
- /**
- * checks for variables require in siteinfo package in the auth library
- *
- * @param array $siteinfo
- *
- * @return array $siteinfo
- * @access public
- */
- function check_siteinfo($siteinfo){
-
- global $xoopsConfig;
- if (!isset($siteinfo)||empty($siteinfo)||!is_array($siteinfo)){
- $siteinfo = array();
- $siteinfo['sitename'] = $xoopsConfig['sitename'];
- $siteinfo['adminmail'] = $xoopsConfig['adminmail'];
- $siteinfo['xoops_url'] = XOOPS_URL;
- }
-
- if (!isset($siteinfo['sitename'])||empty($siteinfo['sitename']))
- $siteinfo['sitename'] = $xoopsConfig['sitename'];
-
- if (!isset($siteinfo['adminmail'])||empty($siteinfo['adminmail']))
- $siteinfo['adminmail'] = $xoopsConfig['adminmail'];
-
- if (!isset($siteinfo['xoops_url'])||empty($siteinfo['xoops_url']))
- $siteinfo['xoops_url'] = XOOPS_URL;
-
-
- return $siteinfo;
- }
+ /**
+ * return the errors for this object as html
+ *
+ * @return string html listing the errors
+ * @access public
+ */
+ function getHtmlErrors()
+ {
+ global $xoopsConfig;
+ $ret = '<br>';
+ if ( $xoopsConfig['debug_mode'] == 1 || $xoopsConfig['debug_mode'] == 2 )
+ {
+ if (!empty($this->_errors)) {
+ foreach ($this->_errors as $errno => $errstr) {
+ $ret .= $errstr . '<br/>';
+ }
+ } else {
+ $ret .= _NONE.'<br />';
+ }
+ $ret .= sprintf(_AUTH_MSG_AUTH_METHOD, $this->auth_method);
+ }
+ else {
+ $ret .= _US_INCORRECTLOGIN;
+ }
+ return $ret;
+ }
}
-
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/auth/auth_ads.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_ads.php 2008-07-27 13:22:16 UTC (rev 1922)
+++ XoopsCore/trunk/htdocs/class/auth/auth_ads.php 2008-07-27 14:22:14 UTC (rev 1923)
@@ -34,16 +34,15 @@
*/
include_once XOOPS_ROOT_PATH . '/class/auth/auth_ldap.php';
-
class XoopsAuthAds extends XoopsAuthLdap {
- /**
+ /**
* Authentication Service constructor
*/
- function XoopsAuthAds (&$dao) {
+ function XoopsAuthAds (&$dao) {
parent::XoopsAuthLdap($dao);
- }
+ }
- /**
+ /**
* Authenticate user again LDAP directory (Bind)
* 2 options :
* Authenticate directly with uname in the DN
@@ -54,79 +53,43 @@
*
* @return bool
*/
- function authenticate($uname, $pwd = null) {
- $authenticated = false;
- if (!extension_loaded('ldap')) {
- $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
- return $authenticated;
- }
- $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
- if ($this->_ds) {
- ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
- ldap_set_option($this->_ds, LDAP_OPT_REFERRALS, 0);
- if ($this->ldap_use_TLS) { // We use TLS secure connection
- if (!ldap_start_tls($this->_ds))
+ function authenticate($uname, $pwd = null) {
+ $authenticated = false;
+ if (!extension_loaded('ldap')) {
+ $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
+ return $authenticated;
+ }
+ $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
+ if ($this->_ds) {
+ ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
+ ldap_set_option($this->_ds, LDAP_OPT_REFERRALS, 0);
+ if ($this->ldap_use_TLS) { // We use TLS secure connection
+ if (!ldap_start_tls($this->_ds))
$this->setErrors(0, _AUTH_LDAP_START_TLS_FAILED);
- }
- // If the uid is not in the DN we proceed to a search
- // The uid is not always in the dn
- $userUPN = $this->getUPN($uname);
- if (!$userUPN) return false;
- // We bind as user to test the credentials
- $authenticated = ldap_bind($this->_ds, $userUPN, $this->cp1252_to_utf8(stripslashes($pwd)));
- if ($authenticated) {
- // We load the Xoops User database
- $dn = $this->getUserDN($uname);
- if ($dn)
- return $this->loadXoopsUser($dn, $uname, $pwd);
- else return false;
- } else {
- $member_handler =& xoops_gethandler('member');
- $user =& $member_handler->loginUser($uname, $pwd);
- if ($user == false) {
- $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userDN . ')');
- } else {
- return $user;
- }
- return $authentication;
- }
- else {
- $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
- }
- @ldap_close($this->_ds);
- return $authenticated;
- }
-
-
- /**
- * Compose the user DN with the configuration.
- *
- *
- * @return userDN or false
- */
- function getUserDN($uname) {
- $userDN = false;
- if (!$this->ldap_loginname_asdn) {
- // Bind with the manager
- if (!ldap_bind($this->_ds, $this->ldap_manager_dn, stripslashes($this->ldap_manager_pass))) {
- $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $this->ldap_manager_dn . ')');
- return false;
- }
- $filter = $this->getFilter($uname);
- $sr = ldap_search($this->_ds, $this->ldap_base_dn, $filter);
- $info = ldap_get_entries($this->_ds, $sr);
- if ($info["count"] > 0) {
- $userDN = $info[0]['dn'];
- } else $this->setErrors(0, sprintf(_AUTH_LDAP_USER_NOT_FOUND, $uname, $filter, $this->ldap_base_dn));
- }
- else {
- $userDN = $this->ldap_loginldap_attr."=".$uname.",".$this->ldap_base_dn;
- }
- return $userDN;
- }
-
-
- /**
+ }
+ // If the uid is not in the DN we proceed to a search
+ // The uid is not always in the dn
+ $userUPN = $this->getUPN($uname);
+ if (!$userUPN) return false;
+ // We bind as user to test the credentials
+ $authenticated = ldap_bind($this->_ds, $userUPN, $this->cp1252_to_utf8(stripslashes($pwd)));
+ if ($authenticated) {
+ // We load the Xoops User database
+ $dn = $this->getUserDN($uname);
+ if ($dn)
+ return $this->loadXoopsUser($dn, $uname, $pwd);
+ else return false;
+ } else $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userUPN . ')');
+ }
+ else {
+ $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
+ }
+ @ldap_close($this->_ds);
+ return $authenticated;
+ }
+
+
+ /**
* Return the UPN = userPrincipalName (Active Directory)
* userPrincipalName = gu...@CP... Often abbreviated to UPN, and
* looks like an email address. Very useful for logging on especially in
@@ -134,290 +97,13 @@
*
* @return userDN or false
*/
- function getUPN($uname) {
- $userDN = false;
- $userDN = $uname."@".$this->ldap_domain_name;
- return $userDN;
- }
-
- /**
- * validate a user
- *
- * @param string $uname
- * @param string $email
- * @param string $pass
- * @param string $vpass
- *
- * @return string
- */
- function validate($uname, $email, $pass, $vpass){
- return XoopsUserUtility::validate($uname, $email, $pass, $vpass);
- }
-
- /**
- * get the xoops site disclaimer
- *
- * @return string
- */
- function network_disclaimer(){
- global $xoopsConfigUser;
- return $xoopsConfigUser['reg_disclaimer'];
- }
+ function getUPN($uname) {
+ $userDN = false;
+ $userDN = $uname."@".$this->ldap_domain_name;
+ return $userDN;
+ }
+
+} // end class
- /**
- * create a user
- *
- * @param bool $user_viewemail
- * @param string $uname
- * @param string $email
- * @param string $url
- * @param string $actkey
- * @param string $pass
- * @param integer $timezone_offset
- * @param bool $user_mailok
- * @param array $siteinfo
- *
- * @return array
- */
- function create_user($user_viewemail, $uname, $email, $url, $actkey,
- $pass, $timezone_offset, $user_mailok, $siteinfo){
- global $xoopsConfig, $xoopsConfigUser;
- $siteinfo = $this->check_siteinfo($siteinfo);
-
- $member_handler =& xoops_gethandler('member');
- $newuser =& $member_handler->createUser();
- $newuser->setVar('user_viewemail',$user_viewemail, true);
- $newuser->setVar('uname', $uname, true);
- $newuser->setVar('email', $email, true);
- if ($url != '') {
- $newuser->setVar('url', formatURL($url), true);
- }
- $newuser->setVar('user_avatar','blank.gif', true);
-
- if (!empty($actkey))
- $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
-
- $newuser->setVar('actkey', $actkey, true);
- $newuser->setVar('pass', md5($pass), true);
- $newuser->setVar('timezone_offset', $timezone_offset, true);
- $newuser->setVar('user_regdate', time(), true);
- $newuser->setVar('uorder',$xoopsConfig['com_order'], true);
- $newuser->setVar('umode',$xoopsConfig['com_mode'], true);
- $newuser->setVar('user_mailok',$user_mailok, true);
- if ($xoopsConfigUser['activation_type'] == 1) {
- $newuser->setVar('level', 1, true);
- }
-
- if (!$member_handler->insertUser($newuser)) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
- }
- $newid = $newuser->getVar('uid');
- if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
- }
- if ($xoopsConfigUser['activation_type'] == 1) {
- $return = array('state' => _US_STATE_TWO, "user" => $newuser);
- }
- // Sending notification email to user for self activation
- if ($xoopsConfigUser['activation_type'] == 0) {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate('register.tpl');
- $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
- $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
- $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
- $xoopsMailer->setToUsers(new XoopsUser($newid));
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
- if ( !$xoopsMailer->send() ) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
- } else {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED);
- }
- // Sending notification email to administrator for activation
- } elseif ($xoopsConfigUser['activation_type'] == 2) {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate('adminactivate.tpl');
- $xoopsMailer->assign('USERNAME', $uname);
- $xoopsMailer->assign('USEREMAIL', $email);
- $xoopsMailer->assign('USERACTLINK', $siteinfo['xoops_url'].'/register.php?op=actv&uname='.$uname.'&actkey='.$actkey);
- $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
- $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
- $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
- $member_handler =& xoops_gethandler('member');
- $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
- if ( !$xoopsMailer->send() ) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
- } else {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED2);
- }
- }
- if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $member_handler =& xoops_gethandler('member');
- $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT,$siteinfo['sitename']));
- $xoopsMailer->setBody(sprintf(_US_HASJUSTREG, $uname));
- $xoopsMailer->send();
- }
-
- return $return;
- }
-
- /**
- * checks an activation of a user
- *
- * @param integer $uname
- * @param string $actkey
- * @param array $siteinfo
- *
- * @return array
- */
- function check_activation($uname, $actkey, $siteinfo){
-
- global $xoopsConfig, $xoopsConfigUser;
-
- global $xoopsDB;
- $sql = "SELECT uid FROM ".$xoopsDB->prefix('users')." WHERE uname = '$uname'";
- $ret = $xoopsDB->query($sql);
- $row = $xoopsDB->fetchArray($ret);
-
- $siteinfo = $this->check_siteinfo($siteinfo);
-
- $member_handler =& xoops_gethandler('member');
- $thisuser =& $member_handler->getUser($row['uid']);
- if (!is_object($thisuser)) {
- exit();
- }
- if ($thisuser->getVar('actkey') != $actkey) {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => _US_ACTKEYNOT);
- } else {
- if ($thisuser->getVar('level') > 0 ) {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACONTACT, "set" => false);
- } else {
- if (false != $member_handler->activateUser($thisuser)) {
- $config_handler =& xoops_gethandler('config');
- $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
- if ($xoopsConfigUser['activation_type'] == 2) {
- $myts =& MyTextSanitizer::getInstance();
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate('activated.tpl');
- $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
- $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
- $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
- $xoopsMailer->setToUsers($thisuser);
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT,$siteinfo['sitename']));
- if ( !$xoopsMailer->send() ) {
- $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILNG, $thisuser->getVar('uname')));
- } else {
- $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILOK, $thisuser->getVar('uname')));
- }
-
- } else {
- $local = explode(' @ ',$thisuser->getVar('user_intrest'));
- if ($local[0] == _US_USERREG){
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => $local[1].'/user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
- } else {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
- }
- }
- } else {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => 'Activation failed!');
- }
- }
- }
-
- return $return;
- }
-
- function lost_password ($email)
- {
-
- if ($email == '') {
- redirect_header("user.php",2,_US_SORRYNOTFOUND);
- exit();
- }
-
- $myts =& MyTextSanitizer::getInstance();
- $member_handler =& xoops_gethandler('member');
- $getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
-
- if (empty($getuser)) {
- $msg = _US_SORRYNOTFOUND;
- redirect_header("user.php",2,$msg);
- exit();
- } else {
- $code = isset($_GET['code']) ? trim($_GET['code']) : '';
- $areyou = substr($getuser[0]->getVar("pass"), 0, 5);
- if ($code != '' && $areyou == $code) {
- $newpass = xoops_makepass();
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate("lostpass2.tpl");
- $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
- $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
- $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
- $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
- $xoopsMailer->assign("NEWPWD", $newpass);
- $xoopsMailer->setToUsers($getuser[0]);
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
- if ( !$xoopsMailer->send() ) {
- echo $xoopsMailer->getErrors();
- }
-
- // Next step: add the new password to the database
- $sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoopsDB->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
- if ( !$xoopsDB->queryF($sql) ) {
- include "header.php";
- echo _US_MAILPWDNG;
- include "footer.php";
- exit();
- }
- redirect_header("user.php", 3, sprintf(_US_PWDMAILED,$getuser[0]->getVar("uname")), false);
- exit();
- // If no Code, send it
- } else {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate("lostpass1.tpl");
- $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
- $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
- $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
- $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
- $xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
- $xoopsMailer->setToUsers($getuser[0]);
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
- include "header.php";
- if ( !$xoopsMailer->send() ) {
- echo $xoopsMailer->getErrors();
- }
- echo "<h4>";
- printf(_US_CONFMAIL,$getuser[0]->getVar("uname"));
- echo "</h4>";
- include "footer.php";
- }
- }
- }
-}
-// end class
-
-
-
-
-?>
+?>
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/class/auth/auth_ldap.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_ldap.php 2008-07-27 13:22:16 UTC (rev 1922)
+++ XoopsCore/trunk/htdocs/class/auth/auth_ldap.php 2008-07-27 14:22:14 UTC (rev 1923)
@@ -34,73 +34,72 @@
*/
include_once XOOPS_ROOT_PATH . '/class/auth/auth_provisionning.php';
-
class XoopsAuthLdap extends XoopsAuth {
var $cp1252_map = array (
"\xc2\x80" => "\xe2\x82\xac", /* EURO SIGN */
- "\xc2\x82" => "\xe2\x80\x9a", /* SINGLE LOW-9 QUOTATION MARK */
- "\xc2\x83" => "\xc6\x92", /* LATIN SMALL LETTER F WITH HOOK */
- "\xc2\x84" => "\xe2\x80\x9e", /* DOUBLE LOW-9 QUOTATION MARK */
- "\xc2\x85" => "\xe2\x80\xa6", /* HORIZONTAL ELLIPSIS */
- "\xc2\x86" => "\xe2\x80\xa0", /* DAGGER */
- "\xc2\x87" => "\xe2\x80\xa1", /* DOUBLE DAGGER */
- "\xc2\x88" => "\xcb\x86", /* MODIFIER LETTER CIRCUMFLEX ACCENT */
- "\xc2\x89" => "\xe2\x80\xb0", /* PER MILLE SIGN */
- "\xc2\x8a" => "\xc5\xa0", /* LATIN CAPITAL LETTER S WITH CARON */
- "\xc2\x8b" => "\xe2\x80\xb9", /* SINGLE LEFT-POINTING ANGLE QUOTATION */
- "\xc2\x8c" => "\xc5\x92", /* LATIN CAPITAL LIGATURE OE */
- "\xc2\x8e" => "\xc5\xbd", /* LATIN CAPITAL LETTER Z WITH CARON */
- "\xc2\x91" => "\xe2\x80\x98", /* LEFT SINGLE QUOTATION MARK */
- "\xc2\x92" => "\xe2\x80\x99", /* RIGHT SINGLE QUOTATION MARK */
- "\xc2\x93" => "\xe2\x80\x9c", /* LEFT DOUBLE QUOTATION MARK */
- "\xc2\x94" => "\xe2\x80\x9d", /* RIGHT DOUBLE QUOTATION MARK */
- "\xc2\x95" => "\xe2\x80\xa2", /* BULLET */
- "\xc2\x96" => "\xe2\x80\x93", /* EN DASH */
- "\xc2\x97" => "\xe2\x80\x94", /* EM DASH */
- "\xc2\x98" => "\xcb\x9c", /* SMALL TILDE */
- "\xc2\x99" => "\xe2\x84\xa2", /* TRADE MARK SIGN */
- "\xc2\x9a" => "\xc5\xa1", /* LATIN SMALL LETTER S WITH CARON */
- "\xc2\x9b" => "\xe2\x80\xba", /* SINGLE RIGHT-POINTING ANGLE QUOTATION*/
- "\xc2\x9c" => "\xc5\x93", /* LATIN SMALL LIGATURE OE */
- "\xc2\x9e" => "\xc5\xbe", /* LATIN SMALL LETTER Z WITH CARON */
- "\xc2\x9f" => "\xc5\xb8" /* LATIN CAPITAL LETTER Y WITH DIAERESIS*/
- );
-
- var $ldap_server;
- var $ldap_port = '389';
- var $ldap_version = '3';
- var $ldap_base_dn;
- var $ldap_loginname_asdn;
- var $ldap_loginldap_attr;
- var $ldap_mail_attr;
- var $ldap_name_attr;
- var $ldap_surname_attr;
- var $ldap_givenname_attr;
- var $ldap_manager_dn;
- var $ldap_manager_pass;
- var $_ds;
+ "\xc2\x82" => "\xe2\x80\x9a", /* SINGLE LOW-9 QUOTATION MARK */
+ "\xc2\x83" => "\xc6\x92", /* LATIN SMALL LETTER F WITH HOOK */
+ "\xc2\x84" => "\xe2\x80\x9e", /* DOUBLE LOW-9 QUOTATION MARK */
+ "\xc2\x85" => "\xe2\x80\xa6", /* HORIZONTAL ELLIPSIS */
+ "\xc2\x86" => "\xe2\x80\xa0", /* DAGGER */
+ "\xc2\x87" => "\xe2\x80\xa1", /* DOUBLE DAGGER */
+ "\xc2\x88" => "\xcb\x86", /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+ "\xc2\x89" => "\xe2\x80\xb0", /* PER MILLE SIGN */
+ "\xc2\x8a" => "\xc5\xa0", /* LATIN CAPITAL LETTER S WITH CARON */
+ "\xc2\x8b" => "\xe2\x80\xb9", /* SINGLE LEFT-POINTING ANGLE QUOTATION */
+ "\xc2\x8c" => "\xc5\x92", /* LATIN CAPITAL LIGATURE OE */
+ "\xc2\x8e" => "\xc5\xbd", /* LATIN CAPITAL LETTER Z WITH CARON */
+ "\xc2\x91" => "\xe2\x80\x98", /* LEFT SINGLE QUOTATION MARK */
+ "\xc2\x92" => "\xe2\x80\x99", /* RIGHT SINGLE QUOTATION MARK */
+ "\xc2\x93" => "\xe2\x80\x9c", /* LEFT DOUBLE QUOTATION MARK */
+ "\xc2\x94" => "\xe2\x80\x9d", /* RIGHT DOUBLE QUOTATION MARK */
+ "\xc2\x95" => "\xe2\x80\xa2", /* BULLET */
+ "\xc2\x96" => "\xe2\x80\x93", /* EN DASH */
+ "\xc2\x97" => "\xe2\x80\x94", /* EM DASH */
+ "\xc2\x98" => "\xcb\x9c", /* SMALL TILDE */
+ "\xc2\x99" => "\xe2\x84\xa2", /* TRADE MARK SIGN */
+ "\xc2\x9a" => "\xc5\xa1", /* LATIN SMALL LETTER S WITH CARON */
+ "\xc2\x9b" => "\xe2\x80\xba", /* SINGLE RIGHT-POINTING ANGLE QUOTATION*/
+ "\xc2\x9c" => "\xc5\x93", /* LATIN SMALL LIGATURE OE */
+ "\xc2\x9e" => "\xc5\xbe", /* LATIN SMALL LETTER Z WITH CARON */
+ "\xc2\x9f" => "\xc5\xb8" /* LATIN CAPITAL LETTER Y WITH DIAERESIS*/
+ );
+
+ var $ldap_server;
+ var $ldap_port = '389';
+ var $ldap_version = '3';
+ var $ldap_base_dn;
+ var $ldap_loginname_asdn;
+ var $ldap_loginldap_attr;
+ var $ldap_mail_attr;
+ var $ldap_name_attr;
+ var $ldap_surname_attr;
+ var $ldap_givenname_attr;
+ var $ldap_manager_dn;
+ var $ldap_manager_pass;
+ var $_ds;
- /**
+ /**
* Authentication Service constructor
*/
- function XoopsAuthLdap (&$dao) {
+ function XoopsAuthLdap (&$dao) {
$this->_dao = $dao;
- //The config handler object allows us to look at the configuration options that are stored in the database
- $config_handler =& xoops_gethandler('config');
- $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
- $confcount = count($config);
- foreach ($config as $key => $val) {
- $this->$key = $val;
- }
- }
+ //The config handler object allows us to look at the configuration options that are stored in the database
+ $config_handler =& xoops_gethandler('config');
+ $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
+ $confcount = count($config);
+ foreach ($config as $key => $val) {
+ $this->$key = $val;
+ }
+ }
function cp1252_to_utf8($str) {
- return strtr(utf8_encode($str), $this->cp1252_map);
+ return strtr(utf8_encode($str), $this->cp1252_map);
}
- /**
+ /**
* Authenticate user again LDAP directory (Bind)
* 2 options :
* Authenticate directly with uname in the DN
@@ -111,379 +110,96 @@
*
* @return bool
*/
- function authenticate($uname, $pwd = null) {
- $authenticated = false;
- if (!extension_loaded('ldap')) {
- $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
- return $authenticated;
- }
- $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
- if ($this->_ds) {
- ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
- if ($this->ldap_use_TLS) { // We use TLS secure connection
- if (!ldap_start_tls($this->_ds))
+ function authenticate($uname, $pwd = null) {
+ $authenticated = false;
+ if (!extension_loaded('ldap')) {
+ $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
+ return $authenticated;
+ }
+ $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
+ if ($this->_ds) {
+ ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
+ if ($this->ldap_use_TLS) { // We use TLS secure connection
+ if (!ldap_start_tls($this->_ds))
$this->setErrors(0, _AUTH_LDAP_START_TLS_FAILED);
- }
- // If the uid is not in the DN we proceed to a search
- // The uid is not always in the dn
- $userDN = $this->getUserDN($uname);
- if (!$userDN) return false;
- // We bind as user to test the credentials
- $authenticated = ldap_bind($this->_ds, $userDN, stripslashes($pwd));
- if ($authenticated) {
- // We load the Xoops User database
- return $this->loadXoopsUser($userDN, $uname, $pwd);
- } else {
- $member_handler =& xoops_gethandler('member');
- $user =& $member_handler->loginUser($uname, $pwd);
- if ($user == false) {
- $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userDN . ')');
- } else {
- return $user;
- }
- return $authentication;
- }
- else {
- $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
- }
- @ldap_close($this->_ds);
- return $authenticated;
- }
-
-
- /**
+ }
+ // If the uid is not in the DN we proceed to a search
+ // The uid is not always in the dn
+ $userDN = $this->getUserDN($uname);
+ if (!$userDN) return false;
+ // We bind as user to test the credentials
+ $authenticated = ldap_bind($this->_ds, $userDN, stripslashes($pwd));
+ if ($authenticated) {
+ // We load the Xoops User database
+ return $this->loadXoopsUser($userDN, $uname, $pwd);
+ } else $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userDN . ')');
+ }
+ else {
+ $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
+ }
+ @ldap_close($this->_ds);
+ return $authenticated;
+ }
+
+
+ /**
* Compose the user DN with the configuration.
*
*
* @return userDN or false
*/
- function getUserDN($uname) {
- $userDN = false;
- if (!$this->ldap_loginname_asdn) {
- // Bind with the manager
- if (!ldap_bind($this->_ds, $this->ldap_manager_dn, stripslashes($this->ldap_manager_pass))) {
- $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $this->ldap_manager_dn . ')');
- return false;
- }
+ function getUserDN($uname) {
+ $userDN = false;
+ if (!$this->ldap_loginname_asdn) {
+ // Bind with the manager
+ if (!ldap_bind($this->_ds, $this->ldap_manager_dn, stripslashes($this->ldap_manager_pass))) {
+ $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $this->ldap_manager_dn . ')');
+ return false;
+ }
$filter = $this->getFilter($uname);
- $sr = ldap_search($this->_ds, $this->ldap_base_dn, $filter);
- $info = ldap_get_entries($this->_ds, $sr);
- if ($info["count"] > 0) {
- $userDN = $info[0]['dn'];
- } else $this->setErrors(0, sprintf(_AUTH_LDAP_USER_NOT_FOUND, $uname, $filter, $this->ldap_base_dn));
- }
- else {
- $userDN = $this->ldap_loginldap_attr."=".$uname.",".$this->ldap_base_dn;
- }
- return $userDN;
- }
+ $sr = ldap_search($this->_ds, $this->ldap_base_dn, $filter);
+ $info = ldap_get_entries($this->_ds, $sr);
+ if ($info["count"] > 0) {
+ $userDN = $info[0]['dn'];
+ } else $this->setErrors(0, sprintf(_AUTH_LDAP_USER_NOT_FOUND, $uname, $filter, $this->ldap_base_dn));
+ }
+ else {
+ $userDN = $this->ldap_loginldap_attr."=".$uname.",".$this->ldap_base_dn;
+ }
+ return $userDN;
+ }
- /**
+ /**
* Load user from XOOPS Database
*
* @return XoopsUser object
*/
function getFilter($uname) {
- $filter = '';
- if ($this->ldap_filter_person != '') {
+ $filter = '';
+ if ($this->ldap_filter_person != '') {
$filter = str_replace('@@loginname@@',$uname, $this->ldap_filter_person);
- }
- else {
- $filter = $this->ldap_loginldap_attr . "=" . $uname;
- }
- return $filter;
+ }
+ else {
+ $filter = $this->ldap_loginldap_attr . "=" . $uname;
+ }
+ return $filter;
}
-
+
function loadXoopsUser($userdn, $uname, $pwd = null) {
$provisHandler = XoopsAuthProvisionning::getInstance($this);
- $sr = ldap_read($this->_ds, $userdn, '(objectclass=*)');
- $entries = ldap_get_entries($this->_ds, $sr);
- if ($entries["count"] > 0) {
- $xoopsUser = $provisHandler->sync($entries[0], $uname, $pwd);
- }
- else $this->setErrors(0, sprintf('loadXoopsUser - ' . _AUTH_LDAP_CANT_READ_ENTRY, $userdn));
+ $sr = ldap_read($this->_ds, $userdn, '(objectclass=*)');
+ $entries = ldap_get_entries($this->_ds, $sr);
+ if ($entries["count"] > 0) {
+ $xoopsUser = $provisHandler->sync($entries[0], $uname, $pwd);
+ }
+ else $this->setErrors(0, sprintf('loadXoopsUser - ' . _AUTH_LDAP_CANT_READ_ENTRY, $userdn));
return $xoopsUser;
}
-
-/**
- * validate a user
- *
- * @param string $uname
- * @param string $email
- * @param string $pass
- * @param string $vpass
- *
- * @return string
- */
- function validate($uname, $email, $pass, $vpass){
- return XoopsUserUtility::validate($uname, $email, $pass, $vpass);
- }
-
- /**
- * get the xoops site disclaimer
- *
- * @return string
- */
- function network_disclaimer(){
- global $xoopsConfigUser;
- return $xoopsConfigUser['reg_disclaimer'];
- }
+
+} // end class
- /**
- * create a user
- *
- * @param bool $user_viewemail
- * @param string $uname
- * @param string $email
- * @param string $url
- * @param string $actkey
- * @param string $pass
- * @param integer $timezone_offset
- * @param bool $user_mailok
- * @param array $siteinfo
- *
- * @return array
- */
- function create_user($user_viewemail, $uname, $email, $url, $actkey,
- $pass, $timezone_offset, $user_mailok, $siteinfo){
- global $xoopsConfig, $xoopsConfigUser;
- $siteinfo = $this->check_siteinfo($siteinfo);
-
- $member_handler =& xoops_gethandler('member');
- $newuser =& $member_handler->createUser();
- $newuser->setVar('user_viewemail',$user_viewemail, true);
- $newuser->setVar('uname', $uname, true);
- $newuser->setVar('email', $email, true);
- if ($url != '') {
- $newuser->setVar('url', formatURL($url), true);
- }
- $newuser->setVar('user_avatar','blank.gif', true);
-
- if (!empty($actkey))
- $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
-
- $newuser->setVar('actkey', $actkey, true);
- $newuser->setVar('pass', md5($pass), true);
- $newuser->setVar('timezone_offset', $timezone_offset, true);
- $newuser->setVar('user_regdate', time(), true);
- $newuser->setVar('uorder',$xoopsConfig['com_order'], true);
- $newuser->setVar('umode',$xoopsConfig['com_mode'], true);
- $newuser->setVar('user_mailok',$user_mailok, true);
- if ($xoopsConfigUser['activation_type'] == 1) {
- $newuser->setVar('level', 1, true);
- }
-
- if (!$member_handler->insertUser($newuser)) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
- }
- $newid = $newuser->getVar('uid');
- if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
- }
- if ($xoopsConfigUser['activation_type'] == 1) {
- $return = array('state' => _US_STATE_TWO, "user" => $newuser);
- }
- // Sending notification email to user for self activation
- if ($xoopsConfigUser['activation_type'] == 0) {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate('register.tpl');
- $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
- $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
- $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
- $xoopsMailer->setToUsers(new XoopsUser($newid));
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
- if ( !$xoopsMailer->send() ) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
- } else {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED);
- }
- // Sending notification email to administrator for activation
- } elseif ($xoopsConfigUser['activation_type'] == 2) {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate('adminactivate.tpl');
- $xoopsMailer->assign('USERNAME', $uname);
- $xoopsMailer->assign('USEREMAIL', $email);
- $xoopsMailer->assign('USERACTLINK', $siteinfo['xoops_url'].'/register.php?op=actv&uname='.$uname.'&actkey='.$actkey);
- $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
- $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
- $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
- $member_handler =& xoops_gethandler('member');
- $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
- if ( !$xoopsMailer->send() ) {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
- } else {
- $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED2);
- }
- }
- if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $member_handler =& xoops_gethandler('member');
- $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT,$siteinfo['sitename']));
- $xoopsMailer->setBody(sprintf(_US_HASJUSTREG, $uname));
- $xoopsMailer->send();
- }
-
- return $return;
- }
-
- /**
- * checks an activation of a user
- *
- * @param integer $uname
- * @param string $actkey
- * @param array $siteinfo
- *
- * @return array
- */
- function check_activation($uname, $actkey, $siteinfo){
-
- global $xoopsConfig, $xoopsConfigUser;
-
- global $xoopsDB;
- $sql = "SELECT uid FROM ".$xoopsDB->prefix('users')." WHERE uname = '$uname'";
- $ret = $xoopsDB->query($sql);
- $row = $xoopsDB->fetchArray($ret);
-
- $siteinfo = $this->check_siteinfo($siteinfo);
-
- $member_handler =& xoops_gethandler('member');
- $thisuser =& $member_handler->getUser($row['uid']);
- if (!is_object($thisuser)) {
- exit();
- }
- if ($thisuser->getVar('actkey') != $actkey) {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => _US_ACTKEYNOT);
- } else {
- if ($thisuser->getVar('level') > 0 ) {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACONTACT, "set" => false);
- } else {
- if (false != $member_handler->activateUser($thisuser)) {
- $config_handler =& xoops_gethandler('config');
- $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
- if ($xoopsConfigUser['activation_type'] == 2) {
- $myts =& MyTextSanitizer::getInstance();
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate('activated.tpl');
- $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
- $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
- $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
- $xoopsMailer->setToUsers($thisuser);
- $xoopsMailer->setFromEmail($siteinfo['adminmail']);
- $xoopsMailer->setFromName($siteinfo['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT,$siteinfo['sitename']));
- if ( !$xoopsMailer->send() ) {
- $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILNG, $thisuser->getVar('uname')));
- } else {
- $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILOK, $thisuser->getVar('uname')));
- }
-
- } else {
- $local = explode(' @ ',$thisuser->getVar('user_intrest'));
- if ($local[0] == _US_USERREG){
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => $local[1].'/user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
- } else {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
- }
- }
- } else {
- $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => 'Activation failed!');
- }
- }
- }
-
- return $return;
- }
-
- function lost_password ($email)
- {
-
- if ($email == '') {
- redirect_header("user.php",2,_US_SORRYNOTFOUND);
- exit();
- }
-
- $myts =& MyTextSanitizer::getInstance();
- $member_handler =& xoops_gethandler('member');
- $getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
-
- if (empty($getuser)) {
- $msg = _US_SORRYNOTFOUND;
- redirect_header("user.php",2,$msg);
- exit();
- } else {
- $code = isset($_GET['code']) ? trim($_GET['code']) : '';
- $areyou = substr($getuser[0]->getVar("pass"), 0, 5);
- if ($code != '' && $areyou == $code) {
- $newpass = xoops_makepass();
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate("lostpass2.tpl");
- $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
- $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
- $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
- $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
- $xoopsMailer->assign("NEWPWD", $newpass);
- $xoopsMailer->setToUsers($getuser[0]);
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
- if ( !$xoopsMailer->send() ) {
- echo $xoopsMailer->getErrors();
- }
-
- // Next step: add the new password to the database
- $sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoopsDB->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
- if ( !$xoopsDB->queryF($sql) ) {
- include "header.php";
- echo _US_MAILPWDNG;
- include "footer.php";
- exit();
- }
- redirect_header("user.php", 3, sprintf(_US_PWDMAILED,$getuser[0]->getVar("uname")), false);
- exit();
- // If no Code, send it
- } else {
- $xoopsMailer =& xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setTemplate("lostpass1.tpl");
- $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
- $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
- $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
- $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
- $xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
- $xoopsMailer->setToUsers($getuser[0]);
- $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
- $xoopsMailer->setFromName($xoopsConfig['sitename']);
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
- include "header.php";
- if ( !$xoopsMailer->send() ) {
- echo $xoopsMailer->getErrors();
- }
- echo "<h4>";
- printf(_US_CONFMAIL,$getuser[0]->getVar("uname"));
- echo "</h4>";
- include "footer.php";
- }
- }
- }
-}
-// end class
-
-
?>
Modified: XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php 2008-07-27 13:22:16 UTC (rev 1922)
+++ XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php 2008-07-27 14:22:14 UTC (rev 1923)
@@ -33,7 +33,6 @@
* @author Pierre-Eric MENUET <pe...@fr...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
-
class XoopsAuthProvisionning {
var $_auth_instance;
@@ -47,24 +46,24 @@
return $provis_instance;
}
- /**
+ /**
* Authentication Service constructor
*/
- function XoopsAuthProvisionning (&$auth_instance) {
- $this->_auth_instance = &$auth_instance;
- $config_handler =& xoops_gethandler('config');
- $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
- foreach ($config as $key => $val) {
- $this->$key = $val;
- }
- $config_gen = $config_handler->getConfigsByCat(XOOPS_CONF);
- $this->default_TZ = $config_gen['default_TZ'];
- $this->theme_set = $config_gen['theme_set'];
- $this->com_mode = $config_gen['com_mode'];
- $this->com_order = $config_gen['com_order'];
- }
+ function XoopsAuthProvisionning (&$auth_instance) {
+ $this->_auth_instance = &$auth_instance;
+ $config_handler =& xoops_gethandler('config');
+ $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
+ foreach ($config as $key => $val) {
+ $this->$key = $val;
+ }
+ $config_gen = $config_handler->getConfigsByCat(XOOPS_CONF);
+ $this->default_TZ = $config_gen['default_TZ'];
+ $this->theme_set = $config_gen['theme_set'];
+ $this->com_mode = $config_gen['com_mode'];
+ $this->com_order = $config_gen['com_order'];
+ }
- /**
+ /**
* Return a Xoops User Object
*
* @return XoopsUser or false
@@ -78,7 +77,7 @@
else return false;
}
- /**
+ /**
* Launch the synchronisation process
*
* @return bool
@@ -97,7 +96,7 @@
return $xoopsUser;
}
- /**
+ /**
* Add a new user to the system
*
* @return bool
@@ -105,34 +104,34 @@
function add($datas, $uname, $pwd = null) {
$ret = false;
$member_handler =& xoops_gethandler('member');
- // Create XOOPS Database User
+ // Create XOOPS Database User
$newuser = $member_handler->createUser();
- $newuser->setVar('uname', $uname);
- $newuser->setVar('pass', md5(stripslashes($pwd)));
- //$newuser->setVar('name', utf8_decode($datas[$this->ldap_givenname_attr][0]) . ' ' . utf8_decode($datas[$this->ldap_surname_attr][0]));
- //$newuser->setVar('email', $datas[$this->ldap_mail_attr][0]);
- $newuser->setVar('rank', 0);
- $newuser->setVar('level', 1);
- $newuser->setVar('timezone_offset', $this->default_TZ);
- $newuser->setVar('theme', $this->theme_set);
- $newuser->setVar('umode', $this->com_mode);
- $newuser->setVar('uorder', $this->com_order);
- $tab_mapping = explode('|', $this->ldap_field_mapping);
- foreach ($tab_mapping as $mapping) {
+ $newuser->setVar('uname', $uname);
+ $newuser->setVar('pass', md5(stripslashes($pwd)));
+ //$newuser->setVar('name', utf8_decode($datas[$this->ldap_givenname_attr][0]) . ' ' . utf8_decode($datas[$this->ldap_surname_attr][0]));
+ //$newuser->setVar('email', $datas[$this->ldap_mail_attr][0]);
+ $newuser->setVar('rank', 0);
+ $newuser->setVar('level', 1);
+ $newuser->setVar('timezone_offset', $this->default_TZ);
+ $newuser->setVar('theme', $this->theme_set);
+ $newuser->setVar('umode', $this->com_mode);
+ $newuser->setVar('uorder', $this->com_order);
+ $tab_mapping = explode('|', $this->ldap_field_mapping);
+ foreach ($tab_mapping as $mapping) {
$fields = explode('=', trim($mapping));
if ($fields[0] && $fields[1])
$newuser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
- }
- if ($member_handler->insertUser($newuser)) {
- foreach ($this->ldap_provisionning_group as $groupid)
- $member_handler->addUserToGroup($groupid, $newuser->getVar('uid'));
- $newuser->unsetNew();
- return $newuser;
- } else redirect_header(XOOPS_URL.'/user.php', 5, $newuser->getHtmlErrors());
- return $ret;
+ }
+ if ($member_handler->insertUser($newuser)) {
+ foreach ($this->ldap_provisionning_group as $groupid)
+ $member_handler->addUserToGroup($groupid, $newuser->getVar('uid'));
+ $newuser->unsetNew();
+ return $newuser;
+ } else redirect_header(XOOPS_URL.'/user.php', 5, $newuser->getHtmlErrors());
+ return $ret;
}
- /**
+ /**
* Modify user information
*
* @return bool
@@ -141,19 +140,19 @@
$ret = false;
$member_handler =& xoops_gethandler('member');
$xoopsUser->setVar('pass', md5(stripslashes($pwd)));
- $tab_mapping = explode('|', $this->ldap_field_mapping);
- foreach ($tab_mapping as $mapping) {
+ $tab_mapping = explode('|', $this->ldap_field_mapping);
+ foreach ($tab_mapping as $mapping) {
$fields = explode('=', trim($mapping));
if ($fields[0] && $fields[1])
$xoopsUser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
- }
+ }
if ($member_handler->insertUser($xoopsUser)) {
- return $xoopsUser;
- } else redirect_header(XOOPS_URL.'/user.php', 5, $xoopsUser->getHtmlErrors());
- return $ret;
+ return $xoopsUser;
+ } else redirect_header(XOOPS_URL.'/user.php', 5, $xoopsUser->getHtmlErrors());
+ return $ret;
}
- /**
+ /**
* Modify a user
*
* @return bool
@@ -161,7 +160,7 @@
function delete() {
}
- /**
+ /**
* Suspend a user
*
* @return bool
@@ -169,7 +168,7 @@
function suspend() {
}
- /**
+ /**
* Restore a user
*
* @return bool
@@ -177,7 +176,7 @@
function restore() {
}
- /**
+ /**
* Add a new user to the system
*
* @return bool
@@ -185,7 +184,7 @@
function resetpwd() {
}
-
-}
+
+} // end class
?>
Deleted: XoopsCore/trunk/htdocs/class/auth/auth_soap.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_soap.php 2008-07-27 13:22:16 UTC (rev 1922)
+++ XoopsCore/trunk/htdocs/class/auth/auth_soap.php 2008-07-27 14:22:14 UTC (rev 1923)
@@ -1,286 +0,0 @@
-<?php
-// $Id: auth_SOAP.php 1600 2008-05-07 wishcraft $
-// auth_soap.php - SOAP authentification class
-// ------------------------------------------------------------------------ //
-// 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 //
-// ------------------------------------------------------------------------ //
-/**
- * @package kernel
- * @subpackage auth
- * @description Authentification class for standard Xoops X-Soap Server V2.3 or V3
- * @author Simon Roberts WISHCRAFT <si...@ch...>
- * @copyright copyright (c) 2000-2003 XOOPS.org
- */
-include_once XOOPS_ROOT_PATH . '/class/auth/auth_soap_provisionning.php';
-include_once XOOPS_ROOT_PATH . '/class/soap/xoopssoap.php';
-
-
-class XoopsAuthSoap extends XoopsAuth {
-
- var $soap_client;
- var $_dao;
- /**
- * Authentication Service constructor
- */
- function XoopsAuthSoap (&$dao) {
- $this->_dao = $dao;
- //The config handler object allows us to look at the configuration options that are stored in the database
- $config_handler =& xoops_gethandler('config');
- $config =& $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
- $confcount = count($config);
- foreach ($config as $key => $val) {
- $this->$key = $val;
- }
- switch (XOOPS_SOAP_LIB){
- case "NUSOAP":
- $this->soap_client = new soapclient($this->soap_soapclient, $this->soap_wdsl, $this->soap_proxyhost, $this->soap_proxyport, $this->soap_proxyusername, $this->soap_proxypassword, $this->soap_timeout, $this->soap_responsetimeout);
- break;
- case "INHERIT":
- $this->soap_client = new soapclient($this->soap_soapclient);
- break;
- }
- }
-
-
- /**
- * Authenticate user again SOAP directory (Bind)
- *
- * @param string $uname Username
- * @param string $pwd Password
- *
- * @return bool
- */
- function authenticate($uname, $pwd = null) {
- $authenticated = false;
-
- if (!$this->soap_client) {
- $this->setErrors(0, _AUTH_SOAP_EXTENSION_NOT_LOAD);
- return $authenticated;
- }
-
- if (in_array(strtolower($uname),explode("|",strtolower($this->soap_filterperson)))){
- $member_handler =& xoops_gethandler('member');
- $user =& $member_handler->loginUser($uname, $pwd);
- if ($user == false) {
- $this->setErrors(1, _US_INCORRECTLOGIN);
- }
- return ($user);
-
- }
-
-
- $rnd = rand(-100000, 100000000);
- switch (XOOPS_SOAP_LIB){
- case "NUSOAP":
- $result = $this->soap_client->call('xoops_authentication', array("username"=> $this->soap_xoops_username, "password"=> $this->soap_xoops_password, "auth" => array('username' => $uname, "password" => $pwd, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pwd), "rand"=>$rnd)));
- break;
- case "INHERIT":
- $result = $this->soap_client->__soapCall('xoops_authentication', array("username"=> $this->soap_xoops_username, "password"=> $this->soap_xoops_password, "auth" => array('username' => $uname, "password" => $pwd, "time" => time(), "passhash" => sha1((time()-$rnd).$uname.$pwd), "rand"=>$rnd)));
- break;
- }
- //
- if ($result['ERRNUM']==1){
- return $this->loadXoopsUser($result["RESULT"], $uname, $pwd);
- } else {
- $member_handler =& xoops_gethandler('member');
- $user =& $member_handler->loginUser($uname, $pwd);
- if ($user == false) {
- $this->setErrors(1, _US_INCORRECTLOGIN);
- }
- return ($user);
- }
-
-
-
- }
-
-
-
- function loadXoopsUser($result, $uname, $pwd = null) {
-
- $provisHandler = XoopsAuthProvisionning::getInstance($this);
- if (count($result) > 0) {
- $xoopsUser = $provisHandler->sync($result, $uname, $pwd);
- }
- else $this->setErrors(0, sprintf('load...
[truncated message content] |
|
From: <wis...@us...> - 2008-07-27 13:22:12
|
Revision: 1922
http://xoops.svn.sourceforge.net/xoops/?rev=1922&view=rev
Author: wishcraft
Date: 2008-07-27 13:22:16 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
phppp - gave the make is so a -"good" after the user testing for 2.3.1 reported OK and in all my test bench ok, this is an Auth System on a water proof keyboard. $siteinfo array needs to have refactorisation but this will be in the multixoops with policy management system.. Seeming in that environment for example you can have multiple admins etc.
Modified Paths:
--------------
XoopsCore/trunk/docs/changelog.txt
XoopsCore/trunk/htdocs/class/auth/auth.php
XoopsCore/trunk/htdocs/class/auth/auth_ads.php
XoopsCore/trunk/htdocs/class/auth/auth_ldap.php
XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php
XoopsCore/trunk/htdocs/class/auth/auth_xoops.php
XoopsCore/trunk/htdocs/class/auth/authfactory.php
XoopsCore/trunk/htdocs/include/registerform.php
XoopsCore/trunk/htdocs/install/language/english/finish.php
XoopsCore/trunk/htdocs/install/language/english/install.php
XoopsCore/trunk/htdocs/install/language/english/install2.php
XoopsCore/trunk/htdocs/install/language/english/welcome.php
XoopsCore/trunk/htdocs/install/makedata.php
XoopsCore/trunk/htdocs/install/page_dbsettings.php
XoopsCore/trunk/htdocs/install/page_modcheck.php
XoopsCore/trunk/htdocs/install/page_pathsettings.php
XoopsCore/trunk/htdocs/install/sql/mysql.data.sql
XoopsCore/trunk/htdocs/install/sql/mysql.structure.sql
XoopsCore/trunk/htdocs/lostpass.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/trunk/htdocs/register.php
Added Paths:
-----------
XoopsCore/trunk/htdocs/class/auth/auth_soap.php
XoopsCore/trunk/htdocs/class/auth/auth_soap_provisionning.php
XoopsCore/trunk/htdocs/class/soap/
XoopsCore/trunk/htdocs/class/soap/nusoap/
XoopsCore/trunk/htdocs/class/soap/nusoap/changelog
XoopsCore/trunk/htdocs/class/soap/nusoap/class.nusoap_base.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.soap_fault.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.soap_parser.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.soap_server.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.soap_transport_http.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.soap_val.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.soapclient.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.wsdl.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.wsdlcache.php
XoopsCore/trunk/htdocs/class/soap/nusoap/class.xmlschema.php
XoopsCore/trunk/htdocs/class/soap/nusoap/index.html
XoopsCore/trunk/htdocs/class/soap/nusoap/nusoap.php
XoopsCore/trunk/htdocs/class/soap/nusoap/nusoapmime.php
XoopsCore/trunk/htdocs/class/soap/xoopssoap.php
XoopsCore/trunk/htdocs/install/class/mainfilemanager.php
XoopsCore/trunk/htdocs/install/class/settingmanager.php
XoopsCore/trunk/htdocs/install/class/textsanitizer.php
XoopsCore/trunk/htdocs/install/img/bg_content_left.gif
XoopsCore/trunk/htdocs/install/img/bg_content_right.gif
XoopsCore/trunk/htdocs/install/img/bg_darkblue.gif
XoopsCore/trunk/htdocs/install/img/bg_table.gif
XoopsCore/trunk/htdocs/install/img/dummy.gif
XoopsCore/trunk/htdocs/install/img/hbar_installer_right.gif
XoopsCore/trunk/htdocs/install/img/hbar_left.gif
XoopsCore/trunk/htdocs/install/img/hbar_middle.gif
XoopsCore/trunk/htdocs/install/img/hbar_right.gif
XoopsCore/trunk/htdocs/install/img/logo.gif
XoopsCore/trunk/htdocs/install/img/no.gif
XoopsCore/trunk/htdocs/install/img/xoops2.gif
XoopsCore/trunk/htdocs/install/img/yes.gif
XoopsCore/trunk/htdocs/install/passwd.php
XoopsCore/trunk/htdocs/install/sql/upgrade/
XoopsCore/trunk/htdocs/install/sql/upgrade/mysql.structure.sql
Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt 2008-07-27 13:04:05 UTC (rev 1921)
+++ XoopsCore/trunk/docs/changelog.txt 2008-07-27 13:22:16 UTC (rev 1922)
@@ -1,8 +1,36 @@
XOOPS Changelog
+============================
+Version 2.3.0 RC - Branch 2.3.1 - Merger - Wishcraft
+============================
+Friday, 4 July 2008 3:47 AM
+
+- Tested 100% on http://auth.ess.io/
+- Lost Password Added
+- Completely Silent Soap Service Built
+- Few bug fixes with WSDL Handle
+- Several Rebuilds Due to the unusal nature of things.
+
+10:07 PM 19/05/2008
+
+- Soap Auth tested on X-SOAP 3.0.2 - Authed through chain sequence of 4 site including legacys systems in test. (wishcraft)
+- SiteInfo array created in auth system for unified registrarion (wishcraft)
+- Comments Added to AuthFactory Routines, Siteinfo array implemented
+- register.php modified to support array package
+- user.php - language, couple of states for passing around created ie.. _US_STATE_ONE (wishcraft).
+- AuthFactory Reduncancy - Soap, Active Directory, LDAP, set to try Xoops Auth if user state doesn't exist (wishcraft).
+- Soap Libraries Instanciated in class library (wishcraft)
+- function_exists & class_exists implemented in all classes and external functions (wishcraft)
+- register.php - refactory for the new authentication factory (wishcraft)
+- Authentication factory remodelled, to include soap authentication (wishcraft)
+- SOAP Language items added (wishcraft)
+
============================
+<<<<<<< .mine
+<<<<<<< .working
+=======
2008/07/26: Version 2.3.0 RC
============================
- Fixed bug #2011644 which Smarty cache path was wrongly configured, cleaned up deprecated paths (phppp/ad...@sf...)
@@ -31,10 +59,43 @@
============================
+>>>>>>> .r1920
2008/04/18: Version 2.3.0 Alpha 3
+=======
+Version 2.3.0 - Branch 2.3.1 - Beta 1 - Wishcraft
+>>>>>>> .merge-right.r1918
============================
+<<<<<<< .working
- Fixed bug #1954797: User can set session expiration to zero (phppp/Alex_Grey)
- Fixed bug #1941250: tags inside [code][/code] are rendered (phppp/Dona_Brasil)
+=======
+Friday, 4 July 2008 3:47 AM
+
+- Tested 100% on http://auth.ess.io/
+- Lost Password Added
+- Completely Silent Soap Service Built
+- Few bug fixes with WSDL Handle
+- Several Rebuilds Due to the unusal nature of things.
+
+10:07 PM 19/05/2008
+
+- Soap Auth tested on X-SOAP 3.0.2 - Authed through chain sequence of 4 site including legacys systems in test. (wishcraft)
+- SiteInfo array created in auth system for unified registrarion (wishcraft)
+- Comments Added to AuthFactory Routines, Siteinfo array implemented
+- register.php modified to support array package
+- user.php - language, couple of states for passing around created ie.. _US_STATE_ONE (wishcraft).
+- AuthFactory Reduncancy - Soap, Active Directory, LDAP, set to try Xoops Auth if user state doesn't exist (wishcraft).
+- Soap Libraries Instanciated in class library (wishcraft)
+- function_exists & class_exists implemented in all classes and external functions (wishcraft)
+- register.php - refactory for the new authentication factory (wishcraft)
+- Authentication factory remodelled, to include soap authentication (wishcraft)
+- SOAP Language items added (wishcraft)
+
+
+============================
+2008/04/18: Version 2.3.0 Beta 1
+============================
+>>>>>>> .merge-right.r1918
- Fixed PHP4 compliance error (phppp/mamba/tzvook)
- Fixed reference related errors (phppp/marco)
- Fixed bug in CAPTCHA render: SESSION data were not registered for CAPTCHA triggered by logged in members (phppp/mamba)
Modified: XoopsCore/trunk/htdocs/class/auth/auth.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth.php 2008-07-27 13:04:05 UTC (rev 1921)
+++ XoopsCore/trunk/htdocs/class/auth/auth.php 2008-07-27 13:22:16 UTC (rev 1922)
@@ -32,6 +32,7 @@
* @author Pierre-Eric MENUET <pe...@fr...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
+
class XoopsAuth {
var $_dao;
@@ -53,54 +54,86 @@
return $authenticated;
}
- /**
- * add an error
- *
- * @param string $value error to add
- * @access public
- */
- function setErrors($err_no, $err_str)
- {
- $this->_errors[$err_no] = trim($err_str);
- }
+ /**
+ * add an error
+ *
+ * @param string $value error to add
+ * @access public
+ */
+ function setErrors($err_no, $err_str)
+ {
+ $this->_errors[$err_no] = trim($err_str);
+ }
- /**
- * return the errors for this object as an array
- *
- * @return array an array of errors
- * @access public
- */
- function getErrors()
- {
- return $this->_errors;
- }
+ /**
+ * return the errors for this object as an array
+ *
+ * @return array an array of errors
+ * @access public
+ */
+ function getErrors()
+ {
+ return $this->_errors;
+ }
- /**
- * return the errors for this object as html
- *
- * @return string html listing the errors
- * @access public
- */
- function getHtmlErrors()
- {
- global $xoopsConfig;
- $ret = '<br>';
- if ( $xoopsConfig['debug_mode'] == 1 || $xoopsConfig['debug_mode'] == 2 )
- {
- if (!empty($this->_errors)) {
- foreach ($this->_errors as $errno => $errstr) {
- $ret .= $errstr . '<br/>';
- }
- } else {
- $ret .= _NONE.'<br />';
- }
- $ret .= sprintf(_AUTH_MSG_AUTH_METHOD, $this->auth_method);
- }
- else {
- $ret .= _US_INCORRECTLOGIN;
- }
- return $ret;
- }
+ /**
+ * return the errors for this object as html
+ *
+ * @return string html listing the errors
+ * @access public
+ */
+ function getHtmlErrors()
+ {
+ global $xoopsConfig;
+ $ret = '<br>';
+ if ( $xoopsConfig['debug_mode'] == 1 || $xoopsConfig['debug_mode'] == 2 )
+ {
+ if (!empty($this->_errors)) {
+ foreach ($this->_errors as $errno => $errstr) {
+ $ret .= $errstr . '<br/>';
+ }
+ } else {
+ $ret .= _NONE.'<br />';
+ }
+ $ret .= sprintf(_AUTH_MSG_AUTH_METHOD, $this->auth_method);
+ }
+ else {
+ $ret .= _US_INCORRECTLOGIN;
+ }
+ return $ret;
+ }
+
+ /**
+ * checks for variables require in siteinfo package in the auth library
+ *
+ * @param array $siteinfo
+ *
+ * @return array $siteinfo
+ * @access public
+ */
+ function check_siteinfo($siteinfo){
+
+ global $xoopsConfig;
+ if (!isset($siteinfo)||empty($siteinfo)||!is_array($siteinfo)){
+ $siteinfo = array();
+ $siteinfo['sitename'] = $xoopsConfig['sitename'];
+ $siteinfo['adminmail'] = $xoopsConfig['adminmail'];
+ $siteinfo['xoops_url'] = XOOPS_URL;
+ }
+
+ if (!isset($siteinfo['sitename'])||empty($siteinfo['sitename']))
+ $siteinfo['sitename'] = $xoopsConfig['sitename'];
+
+ if (!isset($siteinfo['adminmail'])||empty($siteinfo['adminmail']))
+ $siteinfo['adminmail'] = $xoopsConfig['adminmail'];
+
+ if (!isset($siteinfo['xoops_url'])||empty($siteinfo['xoops_url']))
+ $siteinfo['xoops_url'] = XOOPS_URL;
+
+
+ return $siteinfo;
+ }
}
-?>
\ No newline at end of file
+
+?>
Modified: XoopsCore/trunk/htdocs/class/auth/auth_ads.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_ads.php 2008-07-27 13:04:05 UTC (rev 1921)
+++ XoopsCore/trunk/htdocs/class/auth/auth_ads.php 2008-07-27 13:22:16 UTC (rev 1922)
@@ -34,15 +34,16 @@
*/
include_once XOOPS_ROOT_PATH . '/class/auth/auth_ldap.php';
+
class XoopsAuthAds extends XoopsAuthLdap {
- /**
+ /**
* Authentication Service constructor
*/
- function XoopsAuthAds (&$dao) {
+ function XoopsAuthAds (&$dao) {
parent::XoopsAuthLdap($dao);
- }
+ }
- /**
+ /**
* Authenticate user again LDAP directory (Bind)
* 2 options :
* Authenticate directly with uname in the DN
@@ -53,43 +54,79 @@
*
* @return bool
*/
- function authenticate($uname, $pwd = null) {
- $authenticated = false;
- if (!extension_loaded('ldap')) {
- $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
- return $authenticated;
- }
- $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
- if ($this->_ds) {
- ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
- ldap_set_option($this->_ds, LDAP_OPT_REFERRALS, 0);
- if ($this->ldap_use_TLS) { // We use TLS secure connection
- if (!ldap_start_tls($this->_ds))
+ function authenticate($uname, $pwd = null) {
+ $authenticated = false;
+ if (!extension_loaded('ldap')) {
+ $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
+ return $authenticated;
+ }
+ $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
+ if ($this->_ds) {
+ ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
+ ldap_set_option($this->_ds, LDAP_OPT_REFERRALS, 0);
+ if ($this->ldap_use_TLS) { // We use TLS secure connection
+ if (!ldap_start_tls($this->_ds))
$this->setErrors(0, _AUTH_LDAP_START_TLS_FAILED);
- }
- // If the uid is not in the DN we proceed to a search
- // The uid is not always in the dn
- $userUPN = $this->getUPN($uname);
- if (!$userUPN) return false;
- // We bind as user to test the credentials
- $authenticated = ldap_bind($this->_ds, $userUPN, $this->cp1252_to_utf8(stripslashes($pwd)));
- if ($authenticated) {
- // We load the Xoops User database
- $dn = $this->getUserDN($uname);
- if ($dn)
- return $this->loadXoopsUser($dn, $uname, $pwd);
- else return false;
- } else $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userUPN . ')');
- }
- else {
- $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
- }
- @ldap_close($this->_ds);
- return $authenticated;
- }
-
-
- /**
+ }
+ // If the uid is not in the DN we proceed to a search
+ // The uid is not always in the dn
+ $userUPN = $this->getUPN($uname);
+ if (!$userUPN) return false;
+ // We bind as user to test the credentials
+ $authenticated = ldap_bind($this->_ds, $userUPN, $this->cp1252_to_utf8(stripslashes($pwd)));
+ if ($authenticated) {
+ // We load the Xoops User database
+ $dn = $this->getUserDN($uname);
+ if ($dn)
+ return $this->loadXoopsUser($dn, $uname, $pwd);
+ else return false;
+ } else {
+ $member_handler =& xoops_gethandler('member');
+ $user =& $member_handler->loginUser($uname, $pwd);
+ if ($user == false) {
+ $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userDN . ')');
+ } else {
+ return $user;
+ }
+ return $authentication;
+ }
+ else {
+ $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
+ }
+ @ldap_close($this->_ds);
+ return $authenticated;
+ }
+
+
+ /**
+ * Compose the user DN with the configuration.
+ *
+ *
+ * @return userDN or false
+ */
+ function getUserDN($uname) {
+ $userDN = false;
+ if (!$this->ldap_loginname_asdn) {
+ // Bind with the manager
+ if (!ldap_bind($this->_ds, $this->ldap_manager_dn, stripslashes($this->ldap_manager_pass))) {
+ $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $this->ldap_manager_dn . ')');
+ return false;
+ }
+ $filter = $this->getFilter($uname);
+ $sr = ldap_search($this->_ds, $this->ldap_base_dn, $filter);
+ $info = ldap_get_entries($this->_ds, $sr);
+ if ($info["count"] > 0) {
+ $userDN = $info[0]['dn'];
+ } else $this->setErrors(0, sprintf(_AUTH_LDAP_USER_NOT_FOUND, $uname, $filter, $this->ldap_base_dn));
+ }
+ else {
+ $userDN = $this->ldap_loginldap_attr."=".$uname.",".$this->ldap_base_dn;
+ }
+ return $userDN;
+ }
+
+
+ /**
* Return the UPN = userPrincipalName (Active Directory)
* userPrincipalName = gu...@CP... Often abbreviated to UPN, and
* looks like an email address. Very useful for logging on especially in
@@ -97,13 +134,290 @@
*
* @return userDN or false
*/
- function getUPN($uname) {
- $userDN = false;
- $userDN = $uname."@".$this->ldap_domain_name;
- return $userDN;
- }
-
-} // end class
+ function getUPN($uname) {
+ $userDN = false;
+ $userDN = $uname."@".$this->ldap_domain_name;
+ return $userDN;
+ }
+
+ /**
+ * validate a user
+ *
+ * @param string $uname
+ * @param string $email
+ * @param string $pass
+ * @param string $vpass
+ *
+ * @return string
+ */
+ function validate($uname, $email, $pass, $vpass){
+ return XoopsUserUtility::validate($uname, $email, $pass, $vpass);
+ }
+
+ /**
+ * get the xoops site disclaimer
+ *
+ * @return string
+ */
+ function network_disclaimer(){
+ global $xoopsConfigUser;
+ return $xoopsConfigUser['reg_disclaimer'];
+ }
+ /**
+ * create a user
+ *
+ * @param bool $user_viewemail
+ * @param string $uname
+ * @param string $email
+ * @param string $url
+ * @param string $actkey
+ * @param string $pass
+ * @param integer $timezone_offset
+ * @param bool $user_mailok
+ * @param array $siteinfo
+ *
+ * @return array
+ */
+ function create_user($user_viewemail, $uname, $email, $url, $actkey,
+ $pass, $timezone_offset, $user_mailok, $siteinfo){
+ global $xoopsConfig, $xoopsConfigUser;
-?>
\ No newline at end of file
+ $siteinfo = $this->check_siteinfo($siteinfo);
+
+ $member_handler =& xoops_gethandler('member');
+ $newuser =& $member_handler->createUser();
+ $newuser->setVar('user_viewemail',$user_viewemail, true);
+ $newuser->setVar('uname', $uname, true);
+ $newuser->setVar('email', $email, true);
+ if ($url != '') {
+ $newuser->setVar('url', formatURL($url), true);
+ }
+ $newuser->setVar('user_avatar','blank.gif', true);
+
+ if (!empty($actkey))
+ $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
+
+ $newuser->setVar('actkey', $actkey, true);
+ $newuser->setVar('pass', md5($pass), true);
+ $newuser->setVar('timezone_offset', $timezone_offset, true);
+ $newuser->setVar('user_regdate', time(), true);
+ $newuser->setVar('uorder',$xoopsConfig['com_order'], true);
+ $newuser->setVar('umode',$xoopsConfig['com_mode'], true);
+ $newuser->setVar('user_mailok',$user_mailok, true);
+ if ($xoopsConfigUser['activation_type'] == 1) {
+ $newuser->setVar('level', 1, true);
+ }
+
+ if (!$member_handler->insertUser($newuser)) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
+ }
+ $newid = $newuser->getVar('uid');
+ if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
+ }
+ if ($xoopsConfigUser['activation_type'] == 1) {
+ $return = array('state' => _US_STATE_TWO, "user" => $newuser);
+ }
+ // Sending notification email to user for self activation
+ if ($xoopsConfigUser['activation_type'] == 0) {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('register.tpl');
+ $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
+ $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
+ $xoopsMailer->setToUsers(new XoopsUser($newid));
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
+ if ( !$xoopsMailer->send() ) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
+ } else {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED);
+ }
+ // Sending notification email to administrator for activation
+ } elseif ($xoopsConfigUser['activation_type'] == 2) {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('adminactivate.tpl');
+ $xoopsMailer->assign('USERNAME', $uname);
+ $xoopsMailer->assign('USEREMAIL', $email);
+ $xoopsMailer->assign('USERACTLINK', $siteinfo['xoops_url'].'/register.php?op=actv&uname='.$uname.'&actkey='.$actkey);
+ $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
+ $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
+ $member_handler =& xoops_gethandler('member');
+ $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
+ if ( !$xoopsMailer->send() ) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
+ } else {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED2);
+ }
+ }
+ if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $member_handler =& xoops_gethandler('member');
+ $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT,$siteinfo['sitename']));
+ $xoopsMailer->setBody(sprintf(_US_HASJUSTREG, $uname));
+ $xoopsMailer->send();
+ }
+
+ return $return;
+ }
+
+ /**
+ * checks an activation of a user
+ *
+ * @param integer $uname
+ * @param string $actkey
+ * @param array $siteinfo
+ *
+ * @return array
+ */
+ function check_activation($uname, $actkey, $siteinfo){
+
+ global $xoopsConfig, $xoopsConfigUser;
+
+ global $xoopsDB;
+ $sql = "SELECT uid FROM ".$xoopsDB->prefix('users')." WHERE uname = '$uname'";
+ $ret = $xoopsDB->query($sql);
+ $row = $xoopsDB->fetchArray($ret);
+
+ $siteinfo = $this->check_siteinfo($siteinfo);
+
+ $member_handler =& xoops_gethandler('member');
+ $thisuser =& $member_handler->getUser($row['uid']);
+ if (!is_object($thisuser)) {
+ exit();
+ }
+ if ($thisuser->getVar('actkey') != $actkey) {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => _US_ACTKEYNOT);
+ } else {
+ if ($thisuser->getVar('level') > 0 ) {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACONTACT, "set" => false);
+ } else {
+ if (false != $member_handler->activateUser($thisuser)) {
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
+ if ($xoopsConfigUser['activation_type'] == 2) {
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('activated.tpl');
+ $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
+ $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
+ $xoopsMailer->setToUsers($thisuser);
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT,$siteinfo['sitename']));
+ if ( !$xoopsMailer->send() ) {
+ $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILNG, $thisuser->getVar('uname')));
+ } else {
+ $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILOK, $thisuser->getVar('uname')));
+ }
+
+ } else {
+ $local = explode(' @ ',$thisuser->getVar('user_intrest'));
+ if ($local[0] == _US_USERREG){
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => $local[1].'/user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
+ } else {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
+ }
+ }
+ } else {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => 'Activation failed!');
+ }
+ }
+ }
+
+ return $return;
+ }
+
+ function lost_password ($email)
+ {
+
+ if ($email == '') {
+ redirect_header("user.php",2,_US_SORRYNOTFOUND);
+ exit();
+ }
+
+ $myts =& MyTextSanitizer::getInstance();
+ $member_handler =& xoops_gethandler('member');
+ $getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
+
+ if (empty($getuser)) {
+ $msg = _US_SORRYNOTFOUND;
+ redirect_header("user.php",2,$msg);
+ exit();
+ } else {
+ $code = isset($_GET['code']) ? trim($_GET['code']) : '';
+ $areyou = substr($getuser[0]->getVar("pass"), 0, 5);
+ if ($code != '' && $areyou == $code) {
+ $newpass = xoops_makepass();
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate("lostpass2.tpl");
+ $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
+ $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+ $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
+ $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+ $xoopsMailer->assign("NEWPWD", $newpass);
+ $xoopsMailer->setToUsers($getuser[0]);
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
+ if ( !$xoopsMailer->send() ) {
+ echo $xoopsMailer->getErrors();
+ }
+
+ // Next step: add the new password to the database
+ $sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoopsDB->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
+ if ( !$xoopsDB->queryF($sql) ) {
+ include "header.php";
+ echo _US_MAILPWDNG;
+ include "footer.php";
+ exit();
+ }
+ redirect_header("user.php", 3, sprintf(_US_PWDMAILED,$getuser[0]->getVar("uname")), false);
+ exit();
+ // If no Code, send it
+ } else {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate("lostpass1.tpl");
+ $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
+ $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+ $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
+ $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+ $xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
+ $xoopsMailer->setToUsers($getuser[0]);
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
+ include "header.php";
+ if ( !$xoopsMailer->send() ) {
+ echo $xoopsMailer->getErrors();
+ }
+ echo "<h4>";
+ printf(_US_CONFMAIL,$getuser[0]->getVar("uname"));
+ echo "</h4>";
+ include "footer.php";
+ }
+ }
+ }
+}
+// end class
+
+
+
+
+?>
Modified: XoopsCore/trunk/htdocs/class/auth/auth_ldap.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_ldap.php 2008-07-27 13:04:05 UTC (rev 1921)
+++ XoopsCore/trunk/htdocs/class/auth/auth_ldap.php 2008-07-27 13:22:16 UTC (rev 1922)
@@ -34,72 +34,73 @@
*/
include_once XOOPS_ROOT_PATH . '/class/auth/auth_provisionning.php';
+
class XoopsAuthLdap extends XoopsAuth {
var $cp1252_map = array (
"\xc2\x80" => "\xe2\x82\xac", /* EURO SIGN */
- "\xc2\x82" => "\xe2\x80\x9a", /* SINGLE LOW-9 QUOTATION MARK */
- "\xc2\x83" => "\xc6\x92", /* LATIN SMALL LETTER F WITH HOOK */
- "\xc2\x84" => "\xe2\x80\x9e", /* DOUBLE LOW-9 QUOTATION MARK */
- "\xc2\x85" => "\xe2\x80\xa6", /* HORIZONTAL ELLIPSIS */
- "\xc2\x86" => "\xe2\x80\xa0", /* DAGGER */
- "\xc2\x87" => "\xe2\x80\xa1", /* DOUBLE DAGGER */
- "\xc2\x88" => "\xcb\x86", /* MODIFIER LETTER CIRCUMFLEX ACCENT */
- "\xc2\x89" => "\xe2\x80\xb0", /* PER MILLE SIGN */
- "\xc2\x8a" => "\xc5\xa0", /* LATIN CAPITAL LETTER S WITH CARON */
- "\xc2\x8b" => "\xe2\x80\xb9", /* SINGLE LEFT-POINTING ANGLE QUOTATION */
- "\xc2\x8c" => "\xc5\x92", /* LATIN CAPITAL LIGATURE OE */
- "\xc2\x8e" => "\xc5\xbd", /* LATIN CAPITAL LETTER Z WITH CARON */
- "\xc2\x91" => "\xe2\x80\x98", /* LEFT SINGLE QUOTATION MARK */
- "\xc2\x92" => "\xe2\x80\x99", /* RIGHT SINGLE QUOTATION MARK */
- "\xc2\x93" => "\xe2\x80\x9c", /* LEFT DOUBLE QUOTATION MARK */
- "\xc2\x94" => "\xe2\x80\x9d", /* RIGHT DOUBLE QUOTATION MARK */
- "\xc2\x95" => "\xe2\x80\xa2", /* BULLET */
- "\xc2\x96" => "\xe2\x80\x93", /* EN DASH */
- "\xc2\x97" => "\xe2\x80\x94", /* EM DASH */
- "\xc2\x98" => "\xcb\x9c", /* SMALL TILDE */
- "\xc2\x99" => "\xe2\x84\xa2", /* TRADE MARK SIGN */
- "\xc2\x9a" => "\xc5\xa1", /* LATIN SMALL LETTER S WITH CARON */
- "\xc2\x9b" => "\xe2\x80\xba", /* SINGLE RIGHT-POINTING ANGLE QUOTATION*/
- "\xc2\x9c" => "\xc5\x93", /* LATIN SMALL LIGATURE OE */
- "\xc2\x9e" => "\xc5\xbe", /* LATIN SMALL LETTER Z WITH CARON */
- "\xc2\x9f" => "\xc5\xb8" /* LATIN CAPITAL LETTER Y WITH DIAERESIS*/
- );
-
- var $ldap_server;
- var $ldap_port = '389';
- var $ldap_version = '3';
- var $ldap_base_dn;
- var $ldap_loginname_asdn;
- var $ldap_loginldap_attr;
- var $ldap_mail_attr;
- var $ldap_name_attr;
- var $ldap_surname_attr;
- var $ldap_givenname_attr;
- var $ldap_manager_dn;
- var $ldap_manager_pass;
- var $_ds;
+ "\xc2\x82" => "\xe2\x80\x9a", /* SINGLE LOW-9 QUOTATION MARK */
+ "\xc2\x83" => "\xc6\x92", /* LATIN SMALL LETTER F WITH HOOK */
+ "\xc2\x84" => "\xe2\x80\x9e", /* DOUBLE LOW-9 QUOTATION MARK */
+ "\xc2\x85" => "\xe2\x80\xa6", /* HORIZONTAL ELLIPSIS */
+ "\xc2\x86" => "\xe2\x80\xa0", /* DAGGER */
+ "\xc2\x87" => "\xe2\x80\xa1", /* DOUBLE DAGGER */
+ "\xc2\x88" => "\xcb\x86", /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+ "\xc2\x89" => "\xe2\x80\xb0", /* PER MILLE SIGN */
+ "\xc2\x8a" => "\xc5\xa0", /* LATIN CAPITAL LETTER S WITH CARON */
+ "\xc2\x8b" => "\xe2\x80\xb9", /* SINGLE LEFT-POINTING ANGLE QUOTATION */
+ "\xc2\x8c" => "\xc5\x92", /* LATIN CAPITAL LIGATURE OE */
+ "\xc2\x8e" => "\xc5\xbd", /* LATIN CAPITAL LETTER Z WITH CARON */
+ "\xc2\x91" => "\xe2\x80\x98", /* LEFT SINGLE QUOTATION MARK */
+ "\xc2\x92" => "\xe2\x80\x99", /* RIGHT SINGLE QUOTATION MARK */
+ "\xc2\x93" => "\xe2\x80\x9c", /* LEFT DOUBLE QUOTATION MARK */
+ "\xc2\x94" => "\xe2\x80\x9d", /* RIGHT DOUBLE QUOTATION MARK */
+ "\xc2\x95" => "\xe2\x80\xa2", /* BULLET */
+ "\xc2\x96" => "\xe2\x80\x93", /* EN DASH */
+ "\xc2\x97" => "\xe2\x80\x94", /* EM DASH */
+ "\xc2\x98" => "\xcb\x9c", /* SMALL TILDE */
+ "\xc2\x99" => "\xe2\x84\xa2", /* TRADE MARK SIGN */
+ "\xc2\x9a" => "\xc5\xa1", /* LATIN SMALL LETTER S WITH CARON */
+ "\xc2\x9b" => "\xe2\x80\xba", /* SINGLE RIGHT-POINTING ANGLE QUOTATION*/
+ "\xc2\x9c" => "\xc5\x93", /* LATIN SMALL LIGATURE OE */
+ "\xc2\x9e" => "\xc5\xbe", /* LATIN SMALL LETTER Z WITH CARON */
+ "\xc2\x9f" => "\xc5\xb8" /* LATIN CAPITAL LETTER Y WITH DIAERESIS*/
+ );
+
+ var $ldap_server;
+ var $ldap_port = '389';
+ var $ldap_version = '3';
+ var $ldap_base_dn;
+ var $ldap_loginname_asdn;
+ var $ldap_loginldap_attr;
+ var $ldap_mail_attr;
+ var $ldap_name_attr;
+ var $ldap_surname_attr;
+ var $ldap_givenname_attr;
+ var $ldap_manager_dn;
+ var $ldap_manager_pass;
+ var $_ds;
- /**
+ /**
* Authentication Service constructor
*/
- function XoopsAuthLdap (&$dao) {
+ function XoopsAuthLdap (&$dao) {
$this->_dao = $dao;
- //The config handler object allows us to look at the configuration options that are stored in the database
- $config_handler =& xoops_gethandler('config');
- $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
- $confcount = count($config);
- foreach ($config as $key => $val) {
- $this->$key = $val;
- }
- }
+ //The config handler object allows us to look at the configuration options that are stored in the database
+ $config_handler =& xoops_gethandler('config');
+ $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
+ $confcount = count($config);
+ foreach ($config as $key => $val) {
+ $this->$key = $val;
+ }
+ }
function cp1252_to_utf8($str) {
- return strtr(utf8_encode($str), $this->cp1252_map);
+ return strtr(utf8_encode($str), $this->cp1252_map);
}
- /**
+ /**
* Authenticate user again LDAP directory (Bind)
* 2 options :
* Authenticate directly with uname in the DN
@@ -110,96 +111,379 @@
*
* @return bool
*/
- function authenticate($uname, $pwd = null) {
- $authenticated = false;
- if (!extension_loaded('ldap')) {
- $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
- return $authenticated;
- }
- $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
- if ($this->_ds) {
- ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
- if ($this->ldap_use_TLS) { // We use TLS secure connection
- if (!ldap_start_tls($this->_ds))
+ function authenticate($uname, $pwd = null) {
+ $authenticated = false;
+ if (!extension_loaded('ldap')) {
+ $this->setErrors(0, _AUTH_LDAP_EXTENSION_NOT_LOAD);
+ return $authenticated;
+ }
+ $this->_ds = ldap_connect($this->ldap_server, $this->ldap_port);
+ if ($this->_ds) {
+ ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->ldap_version);
+ if ($this->ldap_use_TLS) { // We use TLS secure connection
+ if (!ldap_start_tls($this->_ds))
$this->setErrors(0, _AUTH_LDAP_START_TLS_FAILED);
- }
- // If the uid is not in the DN we proceed to a search
- // The uid is not always in the dn
- $userDN = $this->getUserDN($uname);
- if (!$userDN) return false;
- // We bind as user to test the credentials
- $authenticated = ldap_bind($this->_ds, $userDN, stripslashes($pwd));
- if ($authenticated) {
- // We load the Xoops User database
- return $this->loadXoopsUser($userDN, $uname, $pwd);
- } else $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userDN . ')');
- }
- else {
- $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
- }
- @ldap_close($this->_ds);
- return $authenticated;
- }
-
-
- /**
+ }
+ // If the uid is not in the DN we proceed to a search
+ // The uid is not always in the dn
+ $userDN = $this->getUserDN($uname);
+ if (!$userDN) return false;
+ // We bind as user to test the credentials
+ $authenticated = ldap_bind($this->_ds, $userDN, stripslashes($pwd));
+ if ($authenticated) {
+ // We load the Xoops User database
+ return $this->loadXoopsUser($userDN, $uname, $pwd);
+ } else {
+ $member_handler =& xoops_gethandler('member');
+ $user =& $member_handler->loginUser($uname, $pwd);
+ if ($user == false) {
+ $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $userDN . ')');
+ } else {
+ return $user;
+ }
+ return $authentication;
+ }
+ else {
+ $this->setErrors(0, _AUTH_LDAP_SERVER_NOT_FOUND);
+ }
+ @ldap_close($this->_ds);
+ return $authenticated;
+ }
+
+
+ /**
* Compose the user DN with the configuration.
*
*
* @return userDN or false
*/
- function getUserDN($uname) {
- $userDN = false;
- if (!$this->ldap_loginname_asdn) {
- // Bind with the manager
- if (!ldap_bind($this->_ds, $this->ldap_manager_dn, stripslashes($this->ldap_manager_pass))) {
- $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $this->ldap_manager_dn . ')');
- return false;
- }
+ function getUserDN($uname) {
+ $userDN = false;
+ if (!$this->ldap_loginname_asdn) {
+ // Bind with the manager
+ if (!ldap_bind($this->_ds, $this->ldap_manager_dn, stripslashes($this->ldap_manager_pass))) {
+ $this->setErrors(ldap_errno($this->_ds), ldap_err2str(ldap_errno($this->_ds)) . '(' . $this->ldap_manager_dn . ')');
+ return false;
+ }
$filter = $this->getFilter($uname);
- $sr = ldap_search($this->_ds, $this->ldap_base_dn, $filter);
- $info = ldap_get_entries($this->_ds, $sr);
- if ($info["count"] > 0) {
- $userDN = $info[0]['dn'];
- } else $this->setErrors(0, sprintf(_AUTH_LDAP_USER_NOT_FOUND, $uname, $filter, $this->ldap_base_dn));
- }
- else {
- $userDN = $this->ldap_loginldap_attr."=".$uname.",".$this->ldap_base_dn;
- }
- return $userDN;
- }
+ $sr = ldap_search($this->_ds, $this->ldap_base_dn, $filter);
+ $info = ldap_get_entries($this->_ds, $sr);
+ if ($info["count"] > 0) {
+ $userDN = $info[0]['dn'];
+ } else $this->setErrors(0, sprintf(_AUTH_LDAP_USER_NOT_FOUND, $uname, $filter, $this->ldap_base_dn));
+ }
+ else {
+ $userDN = $this->ldap_loginldap_attr."=".$uname.",".$this->ldap_base_dn;
+ }
+ return $userDN;
+ }
- /**
+ /**
* Load user from XOOPS Database
*
* @return XoopsUser object
*/
function getFilter($uname) {
- $filter = '';
- if ($this->ldap_filter_person != '') {
+ $filter = '';
+ if ($this->ldap_filter_person != '') {
$filter = str_replace('@@loginname@@',$uname, $this->ldap_filter_person);
- }
- else {
- $filter = $this->ldap_loginldap_attr . "=" . $uname;
- }
- return $filter;
+ }
+ else {
+ $filter = $this->ldap_loginldap_attr . "=" . $uname;
+ }
+ return $filter;
}
-
+
function loadXoopsUser($userdn, $uname, $pwd = null) {
$provisHandler = XoopsAuthProvisionning::getInstance($this);
- $sr = ldap_read($this->_ds, $userdn, '(objectclass=*)');
- $entries = ldap_get_entries($this->_ds, $sr);
- if ($entries["count"] > 0) {
- $xoopsUser = $provisHandler->sync($entries[0], $uname, $pwd);
- }
- else $this->setErrors(0, sprintf('loadXoopsUser - ' . _AUTH_LDAP_CANT_READ_ENTRY, $userdn));
+ $sr = ldap_read($this->_ds, $userdn, '(objectclass=*)');
+ $entries = ldap_get_entries($this->_ds, $sr);
+ if ($entries["count"] > 0) {
+ $xoopsUser = $provisHandler->sync($entries[0], $uname, $pwd);
+ }
+ else $this->setErrors(0, sprintf('loadXoopsUser - ' . _AUTH_LDAP_CANT_READ_ENTRY, $userdn));
return $xoopsUser;
}
-
-} // end class
+
+/**
+ * validate a user
+ *
+ * @param string $uname
+ * @param string $email
+ * @param string $pass
+ * @param string $vpass
+ *
+ * @return string
+ */
+ function validate($uname, $email, $pass, $vpass){
+ return XoopsUserUtility::validate($uname, $email, $pass, $vpass);
+ }
+
+ /**
+ * get the xoops site disclaimer
+ *
+ * @return string
+ */
+ function network_disclaimer(){
+ global $xoopsConfigUser;
+ return $xoopsConfigUser['reg_disclaimer'];
+ }
+ /**
+ * create a user
+ *
+ * @param bool $user_viewemail
+ * @param string $uname
+ * @param string $email
+ * @param string $url
+ * @param string $actkey
+ * @param string $pass
+ * @param integer $timezone_offset
+ * @param bool $user_mailok
+ * @param array $siteinfo
+ *
+ * @return array
+ */
+ function create_user($user_viewemail, $uname, $email, $url, $actkey,
+ $pass, $timezone_offset, $user_mailok, $siteinfo){
+ global $xoopsConfig, $xoopsConfigUser;
+ $siteinfo = $this->check_siteinfo($siteinfo);
+
+ $member_handler =& xoops_gethandler('member');
+ $newuser =& $member_handler->createUser();
+ $newuser->setVar('user_viewemail',$user_viewemail, true);
+ $newuser->setVar('uname', $uname, true);
+ $newuser->setVar('email', $email, true);
+ if ($url != '') {
+ $newuser->setVar('url', formatURL($url), true);
+ }
+ $newuser->setVar('user_avatar','blank.gif', true);
+
+ if (!empty($actkey))
+ $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
+
+ $newuser->setVar('actkey', $actkey, true);
+ $newuser->setVar('pass', md5($pass), true);
+ $newuser->setVar('timezone_offset', $timezone_offset, true);
+ $newuser->setVar('user_regdate', time(), true);
+ $newuser->setVar('uorder',$xoopsConfig['com_order'], true);
+ $newuser->setVar('umode',$xoopsConfig['com_mode'], true);
+ $newuser->setVar('user_mailok',$user_mailok, true);
+ if ($xoopsConfigUser['activation_type'] == 1) {
+ $newuser->setVar('level', 1, true);
+ }
+
+ if (!$member_handler->insertUser($newuser)) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
+ }
+ $newid = $newuser->getVar('uid');
+ if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_REGISTERNG);
+ }
+ if ($xoopsConfigUser['activation_type'] == 1) {
+ $return = array('state' => _US_STATE_TWO, "user" => $newuser);
+ }
+ // Sending notification email to user for self activation
+ if ($xoopsConfigUser['activation_type'] == 0) {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('register.tpl');
+ $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
+ $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
+ $xoopsMailer->setToUsers(new XoopsUser($newid));
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
+ if ( !$xoopsMailer->send() ) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
+ } else {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED);
+ }
+ // Sending notification email to administrator for activation
+ } elseif ($xoopsConfigUser['activation_type'] == 2) {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('adminactivate.tpl');
+ $xoopsMailer->assign('USERNAME', $uname);
+ $xoopsMailer->assign('USEREMAIL', $email);
+ $xoopsMailer->assign('USERACTLINK', $siteinfo['xoops_url'].'/register.php?op=actv&uname='.$uname.'&actkey='.$actkey);
+ $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
+ $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
+ $member_handler =& xoops_gethandler('member');
+ $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
+ if ( !$xoopsMailer->send() ) {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGMAILNG);
+ } else {
+ $return = array('state' => _US_STATE_ONE, "text" => _US_YOURREGISTERED2);
+ }
+ }
+ if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $member_handler =& xoops_gethandler('member');
+ $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT,$siteinfo['sitename']));
+ $xoopsMailer->setBody(sprintf(_US_HASJUSTREG, $uname));
+ $xoopsMailer->send();
+ }
+
+ return $return;
+ }
+
+ /**
+ * checks an activation of a user
+ *
+ * @param integer $uname
+ * @param string $actkey
+ * @param array $siteinfo
+ *
+ * @return array
+ */
+ function check_activation($uname, $actkey, $siteinfo){
+
+ global $xoopsConfig, $xoopsConfigUser;
+
+ global $xoopsDB;
+ $sql = "SELECT uid FROM ".$xoopsDB->prefix('users')." WHERE uname = '$uname'";
+ $ret = $xoopsDB->query($sql);
+ $row = $xoopsDB->fetchArray($ret);
+
+ $siteinfo = $this->check_siteinfo($siteinfo);
+
+ $member_handler =& xoops_gethandler('member');
+ $thisuser =& $member_handler->getUser($row['uid']);
+ if (!is_object($thisuser)) {
+ exit();
+ }
+ if ($thisuser->getVar('actkey') != $actkey) {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => _US_ACTKEYNOT);
+ } else {
+ if ($thisuser->getVar('level') > 0 ) {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACONTACT, "set" => false);
+ } else {
+ if (false != $member_handler->activateUser($thisuser)) {
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
+ if ($xoopsConfigUser['activation_type'] == 2) {
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('activated.tpl');
+ $xoopsMailer->assign('SITENAME', $siteinfo['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $siteinfo['adminmail']);
+ $xoopsMailer->assign('SITEURL', $siteinfo['xoops_url']."/");
+ $xoopsMailer->setToUsers($thisuser);
+ $xoopsMailer->setFromEmail($siteinfo['adminmail']);
+ $xoopsMailer->setFromName($siteinfo['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT,$siteinfo['sitename']));
+ if ( !$xoopsMailer->send() ) {
+ $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILNG, $thisuser->getVar('uname')));
+ } else {
+ $return = array("state" => _US_STATE_TWO, "text" => sprintf(_US_ACTVMAILOK, $thisuser->getVar('uname')));
+ }
+
+ } else {
+ $local = explode(' @ ',$thisuser->getVar('user_intrest'));
+ if ($local[0] == _US_USERREG){
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => $local[1].'/user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
+ } else {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'user.php', "opt" => 5, "text" => _US_ACTLOGIN, "set" => false);
+ }
+ }
+ } else {
+ $return = array("state" => _US_STATE_ONE, "action" => "redirect_header", "url" => 'index.php', "opt" => 5, "text" => 'Activation failed!');
+ }
+ }
+ }
+
+ return $return;
+ }
+
+ function lost_password ($email)
+ {
+
+ if ($email == '') {
+ redirect_header("user.php",2,_US_SORRYNOTFOUND);
+ exit();
+ }
+
+ $myts =& MyTextSanitizer::getInstance();
+ $member_handler =& xoops_gethandler('member');
+ $getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
+
+ if (empty($getuser)) {
+ $msg = _US_SORRYNOTFOUND;
+ redirect_header("user.php",2,$msg);
+ exit();
+ } else {
+ $code = isset($_GET['code']) ? trim($_GET['code']) : '';
+ $areyou = substr($getuser[0]->getVar("pass"), 0, 5);
+ if ($code != '' && $areyou == $code) {
+ $newpass = xoops_makepass();
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate("lostpass2.tpl");
+ $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
+ $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+ $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
+ $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+ $xoopsMailer->assign("NEWPWD", $newpass);
+ $xoopsMailer->setToUsers($getuser[0]);
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
+ if ( !$xoopsMailer->send() ) {
+ echo $xoopsMailer->getErrors();
+ }
+
+ // Next step: add the new password to the database
+ $sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoopsDB->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
+ if ( !$xoopsDB->queryF($sql) ) {
+ include "header.php";
+ echo _US_MAILPWDNG;
+ include "footer.php";
+ exit();
+ }
+ redirect_header("user.php", 3, sprintf(_US_PWDMAILED,$getuser[0]->getVar("uname")), false);
+ exit();
+ // If no Code, send it
+ } else {
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate("lostpass1.tpl");
+ $xoopsMailer->assign("SITENAME", $xoopsConfig['sitename']);
+ $xoopsMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
+ $xoopsMailer->assign("SITEURL", XOOPS_URL."/");
+ $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
+ $xoopsMailer->assign("NEWPWD_LINK", XOOPS_URL."/lostpass.php?email=".$email."&code=".$areyou);
+ $xoopsMailer->setToUsers($getuser[0]);
+ $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
+ $xoopsMailer->setFromName($xoopsConfig['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
+ include "header.php";
+ if ( !$xoopsMailer->send() ) {
+ echo $xoopsMailer->getErrors();
+ }
+ echo "<h4>";
+ printf(_US_CONFMAIL,$getuser[0]->getVar("uname"));
+ echo "</h4>";
+ include "footer.php";
+ }
+ }
+ }
+}
+// end class
+
+
?>
Modified: XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php 2008-07-27 13:04:05 UTC (rev 1921)
+++ XoopsCore/trunk/htdocs/class/auth/auth_provisionning.php 2008-07-27 13:22:16 UTC (rev 1922)
@@ -33,6 +33,7 @@
* @author Pierre-Eric MENUET <pe...@fr...>
* @copyright copyright (c) 2000-2003 XOOPS.org
*/
+
class XoopsAuthProvisionning {
var $_auth_instance;
@@ -46,24 +47,24 @@
return $provis_instance;
}
- /**
+ /**
* Authentication Service constructor
*/
- function XoopsAuthProvisionning (&$auth_instance) {
- $this->_auth_instance = &$auth_instance;
- $config_handler =& xoops_gethandler('config');
- $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
- foreach ($config as $key => $val) {
- $this->$key = $val;
- }
- $config_gen = $config_handler->getConfigsByCat(XOOPS_CONF);
- $this->default_TZ = $config_gen['default_TZ'];
- $this->theme_set = $config_gen['theme_set'];
- $this->com_mode = $config_gen['com_mode'];
- $this->com_order = $config_gen['com_order'];
- }
+ function XoopsAuthProvisionning (&$auth_instance) {
+ $this->_auth_instance = &$auth_instance;
+ $config_handler =& xoops_gethandler('config');
+ $config = $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
+ foreach ($config as $key => $val) {
+ $this->$key = $val;
+ }
+ $config_gen = $config_handler->getConfigsByCat(XOOPS_CONF);
+ $this->default_TZ = $config_gen['default_TZ'];
+ $this->theme_set = $config_gen['theme_set'];
+ $this->com_mode = $config_gen['com_mode'];
+ $this->com_order = $config_gen['com_order'];
+ }
- /**
+ /**
* Return a Xoops User Object
*
* @return XoopsUser or false
@@ -77,7 +78,7 @@
else return false;
}
- /**
+ /**
* Launch the synchronisation process
*
* @return bool
@@ -96,7 +97,7 @@
return $xoopsUser;
}
- /**
+ /**
* Add a new user to the system
*
* @return bool
@@ -104,34 +105,34 @@
function add($datas, $uname, $pwd = null) {
$ret = false;
$member_handler =& xoops_gethandler('member');
- // Create XOOPS Database User
+ // Create XOOPS Database User
$newuser = $member_handler->createUser();
- $newuser->setVar('uname', $uname);
- $newuser->setVar('pass', md5(stripslashes($pwd)));
- //$newuser->setVar('name', utf8_decode($datas[$this->ldap_givenname_attr][0]) . ' ' . utf8_decode($datas[$this->ldap_surname_attr][0]));
- //$newuser->setVar('email', $datas[$this->ldap_mail_attr][0]);
- $newuser->setVar('rank', 0);
- $newuser->setVar('level', 1);
- $newuser->setVar('timezone_offset', $this->default_TZ);
- $newuser->setVar('theme', $this->theme_set);
- $newuser->setVar('umode', $this->com_mode);
- $newuser->setVar('uorder', $this->com_order);
- $tab_mapping = explode('|', $this->ldap_field_mapping);
- foreach ($tab_mapping as $mapping) {
+ $newuser->setVar('uname', $uname);
+ $newuser->setVar('pass', md5(stripslashes($pwd)));
+ //$newuser->setVar('name', utf8_decode($datas[$this->ldap_givenname_attr][0]) . ' ' . utf8_decode($datas[$this->ldap_surname_attr][0]));
+ //$newuser->setVar('email', $datas[$this->ldap_mail_attr][0]);
+ $newuser->setVar('rank', 0);
+ $newuser->setVar('level', 1);
+ $newuser->setVar('timezone_offset', $this->default_TZ);
+ $newuser->setVar('theme', $this->theme_set);
+ $newuser->setVar('umode', $this->com_mode);
+ $newuser->setVar('uorder', $this->com_order);
+ $tab_mapping = explode('|', $this->ldap_field_mapping);
+ foreach ($tab_mapping as $mapping) {
$fields = explode('=', trim($mapping));
if ($fields[0] && $fields[1])
$newuser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
- }
- if ($member_handler->insertUser($newuser)) {
- foreach ($this->ldap_provisionning_group as $groupid)
- $member_handler->addUserToGroup($groupid, $newuser->getVar('uid'));
- $newuser->unsetNew();
- return $newuser;
- } else redirect_header(XOOPS_URL.'/user.php', 5, $newuser->getHtmlErrors());
- return $ret;
+ }
+ if ($member_handler->insertUser($newuser)) {
+ foreach ($this->ldap_provisionning_group as $groupid)
+ $member_handler->addUserToGroup($groupid, $newuser->getVar('uid'));
+ $newuser->unsetNew();
+ return $newuser;
+ } else redirect_header(XOOPS_URL.'/user.php', 5, $newuser->getHtmlErrors());
+ return $ret;
}
- /**
+ /**
* Modify user information
*
* @return bool
@@ -140,19 +141,19 @@
$ret = false;
$member_handler =& xoops_gethandler('member');
$xoopsUser->setVar('pass', md5(stripslashes($pwd)));
- $tab_mapping = explode('|', $this->ldap_field_mapping);
- foreach ($tab_mapping as $mapping) {
+ $tab_mapping = explode('|', $this->ldap_field_mapping);
+ foreach ($tab_mapping as $mapping) {
$fields = explode('=', trim($mapping));
if ($fields[0] && $fields[1])
$xoopsUser->setVar(trim($fields[0]), utf8_decode($datas[trim($fields[1])][0]));
- }
+ }
if ($member_handler->insertUser($xoopsUser)) {
- return $xoopsUser;
- } else redirect_header(XOOPS_URL.'/user.php', 5, $xoopsUser->getHtmlErrors());
- return $ret;
+ return $xoopsUser;
+ } else redirect_header(XOOPS_URL.'/user.php', 5, $xoopsUser->getHtmlErrors());
+ return $ret;
}
- /**
+ /**
* Modify a user
*
* @return bool
@@ -160,7 +161,7 @@
function delete() {
}
- /**
+ /**
* Suspend a user
*
* @return bool
@@ -168,7 +169,7 @@
function suspend() {
}
- /**
+ /**
* Restore a user
*
* @return bool
@@ -176,7 +177,7 @@
function restore() {
}
- /**
+ /**
* Add a new user to the system
*
* @return bool
@@ -184,7 +185,7 @@
function resetpwd() {
}
-
-} // end class
+
+}
?>
Added: XoopsCore/trunk/htdocs/class/auth/auth_soap.php
===================================================================
--- XoopsCore/trunk/htdocs/class/auth/auth_soap.php (rev 0)
+++ XoopsCore/trunk/htdocs/class/auth/auth_soap.php 2008-07-27 13:22:16 UTC (rev 1922)
@@ -0,0 +1,286 @@
+<?php
+// $Id: auth_SOAP.php 1600 2008-05-07 wishcraft $
+// auth_soap.php - SOAP authentification class
+// ------------------------------------------------------------------------ //
+// 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 //
+// ------------------------------------------------------------------------ //
+/**
+ * @package kernel
+ * @subpackage auth
+ * @description Authentification class for standard Xoops X-Soap Server V2.3 or V3
+ * @author Simon Roberts WISHCRAFT <si...@ch...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ */
+include_once XOOPS_ROOT_PATH . '/class/auth/auth_soap_provisionning.php';
+include_once XOOPS_ROOT_PATH . '/class/soap/xoopssoap.php';
+
+
+class XoopsAuthSoap extends XoopsAuth {
+
+ var $soap_client;
+ var $_dao;
+ /**
+ * Authentication Service constructor
+ */
+ function XoopsAuthSoap (&$dao) {
+ $this->_dao = $dao;
+ //The config handler object allows us to look at the configuration options that are stored in the database
+ $config_handler =& xoops_gethandler('config');
+ $config =& $config_handler->getConfigsByCat(XOOPS_CONF_AUTH);
+ $confcount = count($config);
+ foreach ($config as $key => $val) {
+ $this->$key = $val;
+ }
+ switch (XOOPS_SOAP_LIB){
+ case "NUSOAP":
+ $this->soap_client = new soapclient($this->soap_soapclient, $this->soap_wdsl, $this->soap_proxyhost, $this->soap_proxyport, $this->soap_proxyusername, $this->soap_proxypassword, $this->soap_timeout, $this->soap_responsetimeout);
+ break;
+ case "INHERIT":
+ $this->soap_client = new soapclient($this->soap_soapclient);
+ break;
+ }
+ }
+
+
+ /**
+ * Authenticate user again SOAP directory (Bind)
+ *
+ * @param string $uname Username
+ * @param string $pwd Password
+ *
+ * @return bool
+ */
+ function authenticate($uname, $pwd = null) {
+ $authenticated = false;
+
+ if (!$this->soap_client) {
+ $this->setErrors(0, _AUTH_SOAP_EXTENSION_NOT_LOAD);
+ return $authenticated;
+ }
+
+ if (in_array(strtolower($uname),explode("|",strtolower($this->soap_filterperson)))){
+ $member_handler =& xoops_gethandler('member');
+ $user =& $member_handler->loginUser($uname, $pwd);
+ if ($user == false) {
+ $this->setErrors(1, _US_INCORRECTLOGIN);
+ }
+ return ($user);
+
+ }
+
+
+ $rnd = rand(-10...
[truncated message content] |
|
From: <ph...@us...> - 2008-07-27 13:03:58
|
Revision: 1921
http://xoops.svn.sourceforge.net/xoops/?rev=1921&view=rev
Author: phppp
Date: 2008-07-27 13:04:05 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Merged from module branch
Modified Paths:
--------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/css/content.css
XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/xotpl/xocpanel.html
Removed Paths:
-------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/extras/
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/css/content.css
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/css/content.css 2008-07-27 12:57:37 UTC (rev 1920)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/css/content.css 2008-07-27 13:04:05 UTC (rev 1921)
@@ -144,139 +144,27 @@
padding:0;
list-style-type:none;
}
-caption {
- font-weight:bold;
- font-style:normal;
+/* Tables */
+th, thead {
+ background: #2A75C5 url('../img/xo-table_bg.png') repeat-x top;
+ padding : 2px;
+ color: #fff;
+ vertical-align : middle;
}
-table.outer, table.xodata-list, table.xo-formfields {
+.outer {
width:100%;
background-color:inherit;
color:#444;
border-spacing:1px;
}
-table.xodata-list {
- border-spacing:0;
- border-collapse:collapse;
-}
-.xodata-list .xodata-entity {
- position:relative;
- margin-top:1.7em;
- margin-bottom:1.7em;
-}
-table td {
- padding:0;
- border-width:0;
-}
-table th, table.outer th,
-#xo-page table.outer th.head,
-#xo-page table.xodata-list thead th,
-#xo-page table.xo-formfields thead th {
- background:#2972c4 url('../img/table-caption3.png') repeat-x left top;
- padding:2px .25em;
- color:#666;
+.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;}
+tr.even td {background-color: #dee3e7; padding: 5px;}
+tr.odd td {background-color: #E9E9E9; padding: 5px;}
+tr.foot td {background-color: #c2cdd6; padding: 5px; color:inherit; font-weight: bold;}
+caption {
font-weight:bold;
+ font-style:normal;
}
-table.outer th a,
-#xo-page table.xodata-list thead th a,
-#xo-page table.xo-formfields thead th a {
- background-color:inherit;
- color:#eee;
-}
-table.outer td,
-#xo-page table.xodata-list tbody td,
-#xo-page table.xo-formfields tbody td {
- background-color:#fcfcfc;
- padding:2px .25em;
- color:inherit;
- border:1px solid #efefef;
-}
-#xo-canvas-rightcolumn .outer td {
-font-size: .9em;
-}
-table.outer .head,
-table.outer .head td,
-table.outer td.odd,
-#xo-page table.xodata-list tbody th,
-#xo-page table.xodata-list tbody td.odd,
-#xo-page table.xo-formfields tbody th {
- background-color:#f4f4f6;
- color: inherit;
-}
-#xo-page table.xodata-list tfoot td, #xo-page table.xodata-list tfoot th {
- background-color:#fcfcfc;
- padding:4px .25em;
- color:inherit;
- text-align:center;
- border:1px solid #efefef;
-}
-#xo-page table.xo-formfields tbody th {
- padding:2px .5em;
- vertical-align: top;
-}
-#xo-page table.xodata-list tbody th[scope=col] {
- background:#c5c5c5 url('../img/table-caption_grey.png') repeat-x left top;
- color:inherit;
-}
-#xo-page table.xodata-list {
- border:1px solid #ccc;
-}
-.xodata-list .xodata-title, table.item td.itemHead {
- background-color:#f4f4f4;
- color:#666;
- padding:.25em .5em;
- font-size:1.1em;
-}
-body.newbb .xodata-list .xodata-title {
- margin:0;
- background:#4AA3F6 url('../img/table-caption3.png') repeat-x left top;
- padding:2px .25em;
- color:#fff;
- font-size:1em;
- font-weight:bold;
- border:1px solid #65ACEE;
-}
-.xodata-list .xodata-title a, table.item td.itemHead a {
- background-color:inherit;
- color:#333;
- font-weight:bold;
-}
-.xodata-list .xodata-entity .xodata-header, .xodata-list .xodata-entity .xodata-body {
- border-left:1px solid #f0f0f0;
- border-right:1px solid #f0f0f0;
-}
-.xodata-list .xodata-body {
- padding-bottom:0;
-}
-.itemBody {
- clear:both;
- padding-top:1em;
- padding-bottom:1em;
-}
-.xodata-list .itemBody {
- padding:0;
-}
-table.item {
- margin-bottom:1.5em;
- border:1px solid #f0f0f0;
-}
-table.item table {
- width:100% !important;
-}
-table.item table td {
- padding:.25em .5em;
-}
-table.item .itemText {
- margin:.25em 0;
-}
-table.item .itemFoot {
- font-size:.9em;;
-}
-table.item td.itemInfo, table.item td.itemBody {
- border-left:1px solid #f8f8f8;
- border-right:1px solid #f8f8f8;
-}
-.itemPoster {font-size: .9em; font-style:normal;}
-.itemPostDate {font-size: .9em; font-style:normal;}
-.itemStats {font-size: .9em; font-style:normal;}
-.itemAdminLink {font-size: .9em;}
-.itemPermaLink {font-size: .9em;}
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/xotpl/xocpanel.html
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/xotpl/xocpanel.html 2008-07-27 12:57:37 UTC (rev 1920)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/modules/thadmin/themes/default/xotpl/xocpanel.html 2008-07-27 13:04:05 UTC (rev 1921)
@@ -19,11 +19,11 @@
<{if $module.mid != 1}>-
<span class="spacer">
<{foreach item=cat from=$module.cats}>
- <a href="<{$cat.link}>"><{$module.name}></a> -
+ <a href="<{$cat.link}>"><{$module.name}></a>
<{/foreach}>
</span>
<{/if}>
- <{/foreach}>
+ <{/foreach}> -
</td>
</tr>
</tbody>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 12:57:27
|
Revision: 1920
http://xoops.svn.sourceforge.net/xoops/?rev=1920&view=rev
Author: phppp
Date: 2008-07-27 12:57:37 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Updated version information
Modified Paths:
--------------
XoopsCore/releases/2.3.0-rc-addon/readme.addon.txt
Modified: XoopsCore/releases/2.3.0-rc-addon/readme.addon.txt
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/readme.addon.txt 2008-07-27 12:56:39 UTC (rev 1919)
+++ XoopsCore/releases/2.3.0-rc-addon/readme.addon.txt 2008-07-27 12:57:37 UTC (rev 1920)
@@ -1,6 +1,6 @@
This addon package provides a couple of libraries in /Frameworks/ and /xoops_lib/ which are required by some modules.
-Several modules are also included for users to help test XOOPS 2.3.0 Beta.
+Several modules are also included for users to help test XOOPS 2.3.0 RC
Note:
-The XOOPS Development Team has no intention to recommend any of the packaged modules on purposes. They are solely used to test XOOPS 2.3.0 Beta package.
+The XOOPS Development Team has no intention to recommend any of the packaged modules on purposes. They are solely used to test XOOPS 2.3.0 RC package.
XOOPS module packages are currently being worked on by XOOPS Module Team and will hopefully be released very soon.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 12:56:32
|
Revision: 1919
http://xoops.svn.sourceforge.net/xoops/?rev=1919&view=rev
Author: phppp
Date: 2008-07-27 12:56:39 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Merged from ThirdParty
Modified Paths:
--------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
Added Paths:
-----------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php
Removed Paths:
-------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/compat/include/Thumbs.db
Property Changed:
----------------
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
Copied: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt (from rev 1901, ThirdParty/Frameworks/art/trunk/art/changelog.txt)
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt (rev 0)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/changelog.txt 2008-07-27 12:56:39 UTC (rev 1919)
@@ -0,0 +1,8 @@
+Frameworks::art changelogs
+
+Version 1.0.0 July 26th
+==========================================================
+1 Cleaned for XOOPS 2.3.0 (phppp)
+2 Added xoops_version file (phppp)
+3 Added changelog file (phppp)
+4 Fixed bug #2027143: $uid was not passed to function mod_getUnameFromId() (phppp/tm255e)
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.admin.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -71,12 +71,6 @@
xoops_load("cache");
$key = "{$dirname}_{$name}";
return XoopsCache::read($key);
-
- $file_name = $dirname."_".$name.".php";
- $file = $root_path."/".$file_name;
-
- $data = @include $file;
- return $data;
}
function mod_loadCacheFile($name, $dirname = null)
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.cache.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -35,10 +35,10 @@
return null;
}
} else {
- load_functions("cache");
- if (!$moduleConfig = mod_loadCacheFile("config", $dirname)) {
+ xoops_load("cache");
+ if (!$moduleConfig = XoopsCache::read("{$dirname}_config")) {
$moduleConfig = mod_fetchConfig($dirname);
- mod_createCacheFile($moduleConfig, "config", $dirname);
+ XoopsCache::write("{$dirname}_config", $moduleConfig);
}
}
if ($customConfig = @include(XOOPS_ROOT_PATH."/modules/{$dirname}/include/plugin.php")){
@@ -100,8 +100,8 @@
return false;
}
- load_functions("cache");
- return mod_clearCacheFile("config", $dirname);
+ xoops_load("cache");
+ return XoopsCache::delete("{$dirname}_config");
}
function mod_clearConfg($dirname = "")
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.config.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -29,8 +29,8 @@
*/
function mod_loadFilters(&$object, $method)
{
- load_functions("cache");
- if (!$modules_active = mod_loadCacheFile("modules_active", "system")) {
+ xoops_load("cache");
+ if (!$modules_active = XoopsCache::read("system_modules_active")) {
$module_handler =& xoops_gethandler('module');
$modules_obj = $module_handler->getObjects(new Criteria('isactive', 1));
$modules_active = array();
@@ -38,7 +38,7 @@
$modules_active[] = $modules_obj[$key]->getVar("dirname");
}
unset($modules_obj);
- mod_createCacheFile($modules_active, "modules_active", "system");
+ XoopsCache::write("system_modules_active", $modules_active);
}
$class = is_object($object) ? get_class($object) : $object;
foreach ($modules_active as $f) {
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.filter.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.ini.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -16,7 +16,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.locale.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,7 +6,7 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -6,38 +6,31 @@
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
if (!defined("FRAMEWORKS_ART_FUNCTIONS_USER")):
define("FRAMEWORKS_ART_FUNCTIONS_USER", true);
-defined("FRAMEWORKS_ART_FUNCTIONS_INI") || include_once (dirname(__FILE__)."/functions.ini.php");
-
xoops_load("userUtility");
-/**
- * Get client IP
- *
- * Adapted from PMA_getIp() [phpmyadmin project]
- *
- * @param bool $asString requiring integer or dotted string
- * @return mixed string or integer value for the IP
- */
function mod_getIP($asString = false)
{
+ trigger_error("Deprecated function '" . __FUNCTION__ . "', user XoopsUserUtility directly.", E_USER_NOTICE);
return XoopsUserUtility::getIP($asString);
}
function &mod_getUnameFromIds( $uid, $usereal = false, $linked = false )
{
+ trigger_error("Deprecated function '" . __FUNCTION__ . "', user XoopsUserUtility directly.", E_USER_NOTICE);
$ids = XoopsUserUtility::getUnameFromIds($uid, $usereal, $linked);
return $ids;
}
-function mod_getUnameFromId( $userid, $usereal = 0, $linked = false)
+function mod_getUnameFromId( $uid, $usereal = 0, $linked = false)
{
+ trigger_error("Deprecated function '" . __FUNCTION__ . "', user XoopsUserUtility directly.", E_USER_NOTICE);
return XoopsUserUtility::getUnameFromId($uid, $usereal, $linked);
}
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/functions.user.php
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php 2008-07-27 11:08:43 UTC (rev 1918)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -2,11 +2,13 @@
/**
* Extended object handlers
*
+ * For backward compat
+ *
* @copyright The XOOPS project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @author Taiwen Jiang <ph...@us...>
* @since 1.00
- * @version $Id: functions.ini.php 386 2007-12-22 00:58:56Z phppp $
+ * @version $Id$
* @package Frameworks
* @subpackage art
*/
@@ -20,12 +22,11 @@
* @copyright copyright © 2005 XoopsForge.com
* @package module::article
*
- * {@link _XoopsPersistableObject}
+ * {@link XoopsObject}
**/
class ArtObject extends XoopsObject
{
-
/**
* @var string
*/
@@ -113,7 +114,7 @@
* @author D.J. (phppp)
* @copyright copyright © 2000 The XOOPS Project
*
-* {@link _XoopsPersistableObjectHandler}
+* {@link XoopsPersistableObjectHandler}
*
*/
Property changes on: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/object.php
___________________________________________________________________
Added: svn:keywords
+ Id
Copied: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php (from rev 1901, ThirdParty/Frameworks/art/trunk/art/xoops_version.php)
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php (rev 0)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoops_version.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Xoops Frameworks addon: art
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
+ * @version $Id$
+ * @package Frameworks
+ */
+
+define("XOOPS_FRAMEWORKS_ART_VERSION", "1.0.0")
+?>
\ No newline at end of file
Copied: XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php (from rev 1901, ThirdParty/Frameworks/art/trunk/art/xoopsart.php)
===================================================================
--- XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php (rev 0)
+++ XoopsCore/releases/2.3.0-rc-addon/htdocs/Frameworks/art/xoopsart.php 2008-07-27 12:56:39 UTC (rev 1919)
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Xoops Frameworks addon: art
+ *
+ * @copyright The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Taiwen Jiang <ph...@us...>
+ * @since 1.00
+ * @version $Id$
+ * @package Frameworks
+ */
+
+class XoopsArt
+{
+ function __construct()
+ {
+ }
+
+ function XoopsArt()
+ {
+ $this->__construct();
+ }
+
+ /**
+ * Load a collective functions of Frameworks
+ *
+ * @param string $group name of the collective functions, empty for functions.php
+ * @return bool
+ */
+ function loadFunctions($group = "")
+ {
+ return include_once FRAMEWORKS_ROOT_PATH . "/art/functions.{$group}" . (empty($group) ? "" : "." ) . "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: <ph...@us...> - 2008-07-27 11:08:34
|
Revision: 1918
http://xoops.svn.sourceforge.net/xoops/?rev=1918&view=rev
Author: phppp
Date: 2008-07-27 11:08:43 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Created 2.3 RC addon branch
Added Paths:
-----------
XoopsCore/releases/2.3.0-rc-addon/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 11:05:41
|
Revision: 1917
http://xoops.svn.sourceforge.net/xoops/?rev=1917&view=rev
Author: phppp
Date: 2008-07-27 11:05:48 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Added release notes and checksum files
Added Paths:
-----------
XoopsCore/releases/2.3.0-rc/checksum.md5
XoopsCore/releases/2.3.0-rc/checksum.php
XoopsCore/releases/2.3.0-rc/release_notes.txt
Added: XoopsCore/releases/2.3.0-rc/checksum.md5
===================================================================
--- XoopsCore/releases/2.3.0-rc/checksum.md5 (rev 0)
+++ XoopsCore/releases/2.3.0-rc/checksum.md5 2008-07-27 11:05:48 UTC (rev 1917)
@@ -0,0 +1,821 @@
+admin.php:1e4c16f7de8ede64830bf80444cd4ffc
+backend.php:ae01fec6d2aa386de5d0f60f9ba7bca5
+banners.php:fdff82e5d33258f9f220eb4aa1c91407
+edituser.php:da9d0522fb4085613dd32627565594b5
+favicon.ico:9187f6607b402df8bbc2aeb69a07bbca
+footer.php:70fc483e17e1d460df341fc793e3ad95
+header.php:afd87d5acface2e77c7542cea3ef2674
+image.php:ed2efef5bd68a83e868dd0678d2f0c9c
+imagemanager.php:416f92e221b517240819ea49cecc23d9
+index.php:ac1547c6a5bdaadaed26f1ac19ea6356
+lostpass.php:37f325660d29a05488f9ef7138a72a1e
+mainfile.dist.php:84e3327ebb5e774b18b67378e7e6a5cf
+misc.php:f13fc13dedb2c43e85c48c449aca83ae
+notifications.php:a4c6af9d2d316307d656d61afa761be7
+pda.php:3573d6e5dc7bd6e06089c830ca46ead2
+pmlite.php:55d9257e19aeac0e8946efa70c4ddc6e
+readpmsg.php:65fc591e07f660a4363619a9bcaf525e
+register.php:dad9a26fbb76b672105a21e9201d7f95
+robots.txt:117129dc086e5e2502be53521849aa1a
+search.php:bd71426f6dd1fcba7dc93b74a8a11c36
+user.php:e848e16015e127bb5d138eebccdb1a8e
+userinfo.php:1d4d0aa2b775091fcf4d043b5195f822
+viewpmsg.php:92bd9a2ddfdc4386c50e87650473d410
+xmlrpc.php:9dc127bdd4de8d61a8bcfe6b43dcd0b6
+xoops.css:1a68c3cbdc91336cba2ca97bccfe368b
+Frameworks/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+Frameworks/readme.txt:d080c46b43c61c498ea53b591052d302
+class/class.tar.php:7ddffcca50ca50e257a30b44b5fa0678
+class/class.zipfile.php:35f2ff6d4e176b92c26aedba894a3680
+class/commentrenderer.php:3a0fe5d8079faa68db0663b116fadd2b
+class/criteria.php:b43afafeaa1e4f70de31c950392de5cf
+class/downloader.php:5a7375b1ee50a0bbaad2084c640e44d6
+class/errorhandler.php:3c74149eb62e31c13e62b4622fa2233c
+class/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/logger.php:57484810c425a9e594a45c9ae610376b
+class/logger_render.php:a3bea64bc954f9cca7dff6740fc1bbd3
+class/mimetypes.inc.php:e0ac6c6fc3e3b890facfc469f77f8d95
+class/module.errorhandler.php:6299e9ee773b3a11da93f8fd9088b771
+class/module.textsanitizer.php:424e4316d24c15ddb8d23802104e9316
+class/pagenav.php:4dfd2cbd1cee9f94c3bf888753a5b405
+class/snoopy.php:296b4a510d7d56254600f08d802ab516
+class/tardownloader.php:3163294fb8cb28d9be68d6a61ad540b1
+class/template.php:550e7d74cdec19f0f385a6e03c435b24
+class/theme.php:bc4b5afc7860cb55eff873ca95f9573f
+class/theme_blocks.php:334791020475a0bfef2ee7dbc55791dd
+class/tree.php:326d2418a7ee05211955d7166c4d9e3b
+class/uploader.php:9d9bc010a3cb4c74ab56808d010c5e4c
+class/userutility.php:063248f5f4bc048e980304e7a94f5809
+class/xoopsblock.php:5a18472c0c345a87dea378676c8ce9bb
+class/xoopscomments.php:92019a502ec0244de0234741217d3292
+class/xoopsformloader.php:c7b959db7b30988a25918d17b8d1f493
+class/xoopslists.php:b69d8fc85c7c2abdd5d1f9082d3e1a45
+class/xoopsload.php:e925ca40c66d8992d591368ae2e5e7a8
+class/xoopslocal.php:66a9c87f962d8a69e380b857955e08e0
+class/xoopsmailer.php:da5a5dee8e7b98e6268b022f6de63538
+class/xoopsmodule.php:38b4faa27cb9e134947f2f3d695d0e19
+class/xoopsobject.php:5e51bb65bc5da35c87b57a51b9fbef18
+class/xoopssecurity.php:14467b100cdba72d5bc9623820d58e7b
+class/xoopsstory.php:105ad38dccab4be92af124c4ffb62262
+class/xoopstopic.php:be16a61024727464b0f3a59179922b61
+class/xoopstree.php:ab3892e26d06aa4f3fe3653dd46f2029
+class/xoopsuser.php:50a775bb453cc7ec2a5d99a6d38677d2
+class/zipdownloader.php:7f3f13ed7f0ed5d806ae7c3b478ac771
+class/auth/auth.php:4965d2f6773895eaeddcb15c0a52b45a
+class/auth/auth_ads.php:9fb8f7b9c2c5a30b6ec93eed1630eaa1
+class/auth/auth_ldap.php:e22ff01ae2ec3b0fd7246027be2fcd11
+class/auth/auth_provisionning.php:1fb5a2d5adf3d22e49e1126205ccb675
+class/auth/auth_xoops.php:c9921044b431fc53cc346d307686e2ab
+class/auth/authfactory.php:977806ae8748c7daa1f2762195775c66
+class/auth/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/cache/apc.php:c83ad6c4997806dd410ee7df04c1bd6a
+class/cache/file.php:6adafb5770e6922bb5399cccd27c9916
+class/cache/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/cache/memcache.php:c633dd09b9145ae9945f632a248c8046
+class/cache/model.php:7d517fff90072cd5184780261333465d
+class/cache/xcache.php:03c9bfebea85066ae9d59318332cdd64
+class/cache/xoopscache.php:54b7d3d047e72e8c54a2abf771747778
+class/captcha/config.image.php:3d373c074cc68c992712080351ffa8c4
+class/captcha/config.php:106b683785983aa986ae0705be225a00
+class/captcha/image.php:182647786a8feb4443368e055c7e1e17
+class/captcha/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/captcha/text.php:0ddcb7901916deb1249a58105d0c2125
+class/captcha/xoopscaptcha.php:5810ec50ca3b4336324d0d6664c91c5b
+class/captcha/image/backgrounds/background00.png:fb3581763a966200f0a5499822410aeb
+class/captcha/image/backgrounds/background01.png:72d6ff99b591465bec168f069762b489
+class/captcha/image/backgrounds/background02.png:f006f365be6408815741723a6d595e52
+class/captcha/image/backgrounds/background03.png:2b6885d88327608a9baefde307d373c1
+class/captcha/image/backgrounds/background04.png:d3871ec9bd5c2e03e7b696b33f605ff0
+class/captcha/image/backgrounds/background05.png:669c4570010b452708390f24edd87239
+class/captcha/image/backgrounds/background06.png:29d65b8a1462fe2da10830c67cf60b3d
+class/captcha/image/backgrounds/background07.png:37177ce79aa9fb2150c952c6b3870a3d
+class/captcha/image/backgrounds/background08.png:af16477968880c749d268361ce190cc4
+class/captcha/image/backgrounds/background09.png:535b4bcffa2ffbd15a90ed7fc01cb1bd
+class/captcha/image/backgrounds/background10.png:5eae69d1e10d013f0208241f876c3a6a
+class/captcha/image/backgrounds/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/captcha/image/fonts/Vera.ttf:e50d402efa0e7d83d07d064088e0d0ab
+class/captcha/image/fonts/VeraBI.ttf:b9b6db54431fd943c22a27043c83fd5b
+class/captcha/image/fonts/VeraBd.ttf:5ada93df9cacdc6a4e75927aea636f40
+class/captcha/image/fonts/VeraIt.ttf:2112ee99b77d473def185d4e9ee8e26d
+class/captcha/image/fonts/VeraMoBI.ttf:d05149f93d1a51b589f17461e3088a91
+class/captcha/image/fonts/VeraMoBd.ttf:0da96c353f37ddd3450400af9ab4286e
+class/captcha/image/fonts/VeraMoIt.ttf:838f5ac0d1903e8d52f37fa6c3d57f1e
+class/captcha/image/fonts/VeraMono.ttf:a2a43ee17707a4a0fdacdec819cc0f48
+class/captcha/image/fonts/VeraSe.ttf:8dbf7077c09caa5d7aa0dfa4aae46cc8
+class/captcha/image/fonts/index.html:d4d788249d08e2e8b07210aa65cb614d
+class/captcha/image/fonts/verasebd.ttf:2670b47693fb67f37acb1f5f387ebd41
+class/captcha/image/scripts/image.php:55a03f96c15d917e5e1ceb30591d9f1e
+class/captcha/image/scripts/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/database/database.php:5365dfe965ae0c050561399e4f59aeff
+class/database/databasefactory.php:5612c40b86c2556cce12be5cd1139af7
+class/database/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/database/mysqldatabase.php:11c916fc4a5b030a38ba6ea13bd4e1d7
+class/database/sqlutility.php:83f930ea4157cf8d55183ede4629f12c
+class/file/file.php:819148688ab14ca28cab8e6de33298f3
+class/file/folder.php:b6534ee3a70a1e623e78fcd223641b41
+class/file/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/file/xoopsfile.php:6b4125f5ae3aba62f4a27a067d167c78
+class/mail/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/mail/xoopsmultimailer.php:1b31d054be1b58fe16708d4499810a9f
+class/mail/phpmailer/ChangeLog.txt:2b88e3d938757c0cf9e6c9e0a2793f81
+class/mail/phpmailer/LICENSE:278f2557e3b277b94e9a8430f6a6d0a9
+class/mail/phpmailer/README:0514b72ef12227b75790617d54cdf43d
+class/mail/phpmailer/class.phpmailer.php:b5f62d2f8dd968d15d8356f28dde24bb
+class/mail/phpmailer/class.pop3.php:581a3e0795f05ace32915c794d154901
+class/mail/phpmailer/class.smtp.php:9f7c9d822994970376988396ce1848e2
+class/mail/phpmailer/codeworxtech.html:42a2cf1c75c8a4b38ce04b3eab59ab52
+class/mail/phpmailer/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/mail/phpmailer/language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/mail/phpmailer/language/phpmailer.lang-br.php:10959c25f9a712fc6f2af040268167c5
+class/mail/phpmailer/language/phpmailer.lang-ca.php:fd5cf56c9fd9289566fb07ed69ba6846
+class/mail/phpmailer/language/phpmailer.lang-cz.php:b58bfccb03f7fde1a990adf3ed5960d9
+class/mail/phpmailer/language/phpmailer.lang-de.php:755e18b3b3feadde25d957eba1d69852
+class/mail/phpmailer/language/phpmailer.lang-dk.php:a9a395c1857d4d2c816023130793dacb
+class/mail/phpmailer/language/phpmailer.lang-en.php:7ff797303960fb258da42a495d8c74a9
+class/mail/phpmailer/language/phpmailer.lang-es.php:cca51f2fbce090fd693a1dc61415cb5d
+class/mail/phpmailer/language/phpmailer.lang-et.php:1951b0646aab7a3298a71d303d27bbd6
+class/mail/phpmailer/language/phpmailer.lang-fi.php:423111a316c9359f266fbfb93567690b
+class/mail/phpmailer/language/phpmailer.lang-fo.php:50a2481c946f70977efd5282db86192e
+class/mail/phpmailer/language/phpmailer.lang-fr.php:9c36efd30cb623f438f021ab63dd3ed3
+class/mail/phpmailer/language/phpmailer.lang-hu.php:6c5980341213b20981450c50da070802
+class/mail/phpmailer/language/phpmailer.lang-it.php:93a60662d109eeddda1cf911a8503d2f
+class/mail/phpmailer/language/phpmailer.lang-ja.php:6f9eb63106e972b7ff9f9d605f88030f
+class/mail/phpmailer/language/phpmailer.lang-nl.php:f16deb5ae7099cbb655df0dfefb266ea
+class/mail/phpmailer/language/phpmailer.lang-no.php:0ba3da5cc39844b3c52c15eb25bff87d
+class/mail/phpmailer/language/phpmailer.lang-pl.php:c852a96bc91277a20c583334e413e7f3
+class/mail/phpmailer/language/phpmailer.lang-ro.php:3a71314885266365662a94fdfcce4db6
+class/mail/phpmailer/language/phpmailer.lang-ru.php:d6cab73dfe93f6098601ff670a8c050a
+class/mail/phpmailer/language/phpmailer.lang-se.php:e0d8fff18a2dc8a2474646294045e465
+class/mail/phpmailer/language/phpmailer.lang-tr.php:d534d8209d8425138f497ef45f73b003
+class/model/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/model/joint.php:c0458170fd7a456c7f3a13dce4a44e28
+class/model/read.php:1a195071a90f21575e8a9236972fd63b
+class/model/stats.php:387ec6c3bcf578ee131f6c135fd56a50
+class/model/sync.php:e3d89651c36a3dd159eea7437818662c
+class/model/write.php:dead49762b9bb524b3f8468522740eeb
+class/model/xoopsmodel.php:ea2baf758cdebf104c5da397fc775d0d
+class/smarty/Config_File.class.php:f9e36874392acc7b8a6575cc8c7f22af
+class/smarty/Smarty.class.php:af71a204667aadf5e1471cb741b98db2
+class/smarty/Smarty_Compiler.class.php:76a1e136d6bf77b740fe3d59edfb3d69
+class/smarty/debug.tpl:def6c6e062941c8b2986f9f977b26307
+class/smarty/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/smarty/configs/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/smarty/configs/test.conf:2f99e2310b1dd4a254c594c49549d9d2
+class/smarty/internals/core.assemble_plugin_filepath.php:c98832bd718c94629c732b5d4c2980cb
+class/smarty/internals/core.assign_smarty_interface.php:4c2dd142c1c59e101b2f60cfc7a7cdc2
+class/smarty/internals/core.create_dir_structure.php:a12f6e4653dc814369202e0ed57206b0
+class/smarty/internals/core.display_debug_console.php:297b9baf349e7f32e8e815612e823e3c
+class/smarty/internals/core.get_include_path.php:ba78ea6d4112d4325b00e4b8101497c6
+class/smarty/internals/core.get_microtime.php:72eb40e8367f77f0bd251e15a5bd4f5f
+class/smarty/internals/core.get_php_resource.php:e0fccd538d6f0ed8915d39cc2f9dd860
+class/smarty/internals/core.is_secure.php:7ea83dd65e64bc0bc893d44096ec61e0
+class/smarty/internals/core.is_trusted.php:83e22de7a251fef6a033769b35989bf6
+class/smarty/internals/core.load_plugins.php:d60028c542ec06749cd2d381bc07d0c2
+class/smarty/internals/core.load_resource_plugin.php:08d531fb688eed7253b316b11436e512
+class/smarty/internals/core.process_cached_inserts.php:2a846ebfec89211b7090149052374059
+class/smarty/internals/core.process_compiled_include.php:6da8abe9ab2050618fd6e344fbc8059b
+class/smarty/internals/core.read_cache_file.php:e7de28f374768f8b319687a34e226c80
+class/smarty/internals/core.rm_auto.php:8834d9e9a8aa8473244d74096638b5c2
+class/smarty/internals/core.rmdir.php:08209df8f3113b0d8322bcac3b5e055b
+class/smarty/internals/core.run_insert_handler.php:f6452eb1f0f65cf3b07634228ea4c938
+class/smarty/internals/core.smarty_include_php.php:0d87e492eb18ec8b4fa492f2ac34c163
+class/smarty/internals/core.write_cache_file.php:6e0ca7e246ee7a6fea7e2e6e4381332b
+class/smarty/internals/core.write_compiled_include.php:ff7944e8092eaf7c2ee97d865df29788
+class/smarty/internals/core.write_compiled_resource.php:caa79e832d4587991606dd9a0988c852
+class/smarty/internals/core.write_file.php:23f99e19895028592cff61325b6ed0b1
+class/smarty/internals/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/smarty/plugins/block.textformat.php:f4e1cc15997ff132066f5e4e09e92054
+class/smarty/plugins/compiler.assign.php:b4f1eb6f5a8cde9dbec9f5fb1ccb108c
+class/smarty/plugins/function.assign_debug_info.php:0abdfebfea185a7b1a727d9546e244be
+class/smarty/plugins/function.config_load.php:fa6466c59cab6333c64ac270dd6c53b1
+class/smarty/plugins/function.counter.php:9531e844efd007c593dadd6173cb0bbd
+class/smarty/plugins/function.cycle.php:db7b2e51bd5e26f93032929dcb2d531b
+class/smarty/plugins/function.debug.php:4963d564da17a2578fc5f56d9c53e7bc
+class/smarty/plugins/function.eval.php:3fedd0e2a4c285200c12fe6427bc2739
+class/smarty/plugins/function.fetch.php:51259f99b6554fa1a6a60013a5e7880a
+class/smarty/plugins/function.html_checkboxes.php:a05460918e36fd9ef66d955754868a3e
+class/smarty/plugins/function.html_image.php:de11daabe07795fe4229b8d0185489dd
+class/smarty/plugins/function.html_options.php:b634076ab0424a5b8310ff733c5615a6
+class/smarty/plugins/function.html_radios.php:6a00315efe8f8202823ade3bf3e6e513
+class/smarty/plugins/function.html_select_date.php:ad1d200bf750d98379cfc5507eac681d
+class/smarty/plugins/function.html_select_time.php:ac7c160c72b293e6509840a5aba9a429
+class/smarty/plugins/function.html_table.php:d7ade8af24efeb33f852bef185004521
+class/smarty/plugins/function.mailto.php:03b5b66b3c6221c34b0d27c030dc7b60
+class/smarty/plugins/function.math.php:0b33b8526bcff403e3d650c3d7eb982b
+class/smarty/plugins/function.popup.php:1e8b78080d08a386ba297c0dbb7c3a7b
+class/smarty/plugins/function.popup_init.php:b2353a42807535109e1f037c0d51f19c
+class/smarty/plugins/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/smarty/plugins/modifier.capitalize.php:70f58c49c5bd2851be11a3d67a92d2a4
+class/smarty/plugins/modifier.cat.php:9dbc6c2d6d78165d9d0ffae481509b6a
+class/smarty/plugins/modifier.count_characters.php:91694b84f8b86aa551ff49ced16dbd11
+class/smarty/plugins/modifier.count_paragraphs.php:c64e0f47b6435424a7bf9647eed06c1e
+class/smarty/plugins/modifier.count_sentences.php:c22e43e96e6ecd34cc18bc5235d59337
+class/smarty/plugins/modifier.count_words.php:073467c9ea7434647bb9ff27fe09183b
+class/smarty/plugins/modifier.date_format.php:5d57183abba166f670d0b8649086f516
+class/smarty/plugins/modifier.debug_print_var.php:083998f71b350e0f2bea5b46477680c2
+class/smarty/plugins/modifier.default.php:11c16bd6f7dde6d576d7f93433652925
+class/smarty/plugins/modifier.escape.php:3bd0b2464f2fe8e2688da39079d84190
+class/smarty/plugins/modifier.indent.php:ea1f5db88c00e850c3968e434eadb074
+class/smarty/plugins/modifier.lower.php:5520933762ceac07d49e658c52587279
+class/smarty/plugins/modifier.nl2br.php:1d16b98e8ec34aac69f0827fab1dc999
+class/smarty/plugins/modifier.regex_replace.php:8410e0a83750cd1b9553b3e8fc861ab5
+class/smarty/plugins/modifier.replace.php:b7d144b301a878c3015f9ba96b1922c6
+class/smarty/plugins/modifier.spacify.php:66993120ab60306acd278a327c5af448
+class/smarty/plugins/modifier.string_format.php:401048107fc62eecf175d2a0ab997161
+class/smarty/plugins/modifier.strip.php:b1281f77297db8c1e50bc1fd883ebd78
+class/smarty/plugins/modifier.strip_tags.php:481144a581e2d56a2182add2e09c5641
+class/smarty/plugins/modifier.truncate.php:da35c3d0a2dfc9ea11c32b3a10246aa7
+class/smarty/plugins/modifier.upper.php:0ef0e9784273f5d5384f34ad303bd15e
+class/smarty/plugins/modifier.wordwrap.php:b80bdf801ac29e3aa4662a0428b676e4
+class/smarty/plugins/outputfilter.trimwhitespace.php:6535eaea7108bacf0bd81d45983eced2
+class/smarty/plugins/shared.escape_special_chars.php:2f7221015323ba27d2ed5ae20450fa0d
+class/smarty/plugins/shared.make_timestamp.php:29ffe6553da8fda72147a12273105e10
+class/smarty/xoops_plugins/compiler.foreachq.php:a60d43c3a7eacbcaea56d6065d9528a8
+class/smarty/xoops_plugins/compiler.includeq.php:eb7f9d5d3ea79a99ca253e7a6d20d45c
+class/smarty/xoops_plugins/compiler.xoAppUrl.php:16e8ce79f7646046f7e95e837f6bfba1
+class/smarty/xoops_plugins/compiler.xoImgUrl.php:a3b6772385ef1738a703c8fb86c8e849
+class/smarty/xoops_plugins/function.xoInboxCount.php:f631b3aa1cfd35e9ee40db59abbe8db3
+class/smarty/xoops_plugins/function.xoPageNav.php:f9ab686982f97c767a63332726218960
+class/smarty/xoops_plugins/function.xoops_link.php:73245b625581892220aa5742045761a8
+class/smarty/xoops_plugins/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/smarty/xoops_plugins/modifier.debug_print_var.php:bd886be994e60ff00ef36fa5174e6044
+class/smarty/xoops_plugins/resource.db.php:5c051ff3da9740cf75377b896690b59d
+class/textsanitizer/censor.php:bfa67807abbc6290c6d2c77a28d4f1de
+class/textsanitizer/config.mytscensor.php:dd1b309c8da0724ae99f1dcae92d10cf
+class/textsanitizer/config.mytsflash.php:a4f596cdfa12c126bb8c4aebbb006bf7
+class/textsanitizer/config.mytsimage.php:b46632b7d4acf2f372fc934346266a41
+class/textsanitizer/config.mytssyntaxhighlight.php:676af341674161070bd525f4bf7d85c9
+class/textsanitizer/config.mytstextfilter.php:3736213552d7114aace90fd4e29921fe
+class/textsanitizer/config.mytswiki.php:25237c2355b168fe35d8f7f78623a5b7
+class/textsanitizer/config.php:a6d940f6d99b3800529b9b2967d3ac5c
+class/textsanitizer/flash.php:4bea7f0f732a4baab7aaa712aaf7d2da
+class/textsanitizer/geshi.php:09cb91d8384a088e456a087bfbfd0763
+class/textsanitizer/iframe.php:7bb7d93f88806e4c72bc80ff3bc09836
+class/textsanitizer/image.php:84cb215982b9d904913838ef3215e665
+class/textsanitizer/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/textsanitizer/mms.php:3642c98da751e5af7008deed649f28d9
+class/textsanitizer/rtsp.php:af5c8767530614fb6f11228f0a7b1327
+class/textsanitizer/syntaxhighlight.php:42ee8ab9c147659b4272a3acbdd54b62
+class/textsanitizer/textfilter.php:9194b09c05f52d806be821569f594e42
+class/textsanitizer/wiki.php:6f5e48fc82c50301d23adefa3210a755
+class/textsanitizer/wmp.php:5ab1d8a268b30722f7d8dd864598310e
+class/textsanitizer/xoops.js:00b472bc33da79e3d2623f345efb071a
+class/textsanitizer/youtube.php:64c3d8a1ffc2c59f3f452f409d1dca9b
+class/utility/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/utility/xoopsutility.php:8c025d45d012739180dd3cb0715fe08d
+class/xml/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xml/saxparser.php:9d7c8738e1ecf9e363819a83497923ab
+class/xml/themesetparser.php:c1c53f60e35f9a2f5f43ddec72757b57
+class/xml/xmltaghandler.php:22e50e30006880fb0c1634fa766383da
+class/xml/rpc/bloggerapi.php:461a27720a7230938a697237ee33182c
+class/xml/rpc/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xml/rpc/metaweblogapi.php:1cad7a5679a1c52ed7ec3ca284bfb778
+class/xml/rpc/movabletypeapi.php:16024fab4c3a14af1546d46fbee54dc0
+class/xml/rpc/xmlrpcapi.php:05404eee87673d77cf187e3696d1c349
+class/xml/rpc/xmlrpcparser.php:be6aefd00331160cfb2d28c165431ee3
+class/xml/rpc/xmlrpctag.php:ed45035c83609e427f28395c74a433cd
+class/xml/rpc/xoopsapi.php:3aa0929fa7dfb091a26b4b3697cc3eec
+class/xml/rss/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xml/rss/xmlrss2parser.php:31c9a32f22962d1b1caf979319ac460c
+class/xoopseditor/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopseditor/readme.txt:dda1b5e7554c16267470d965e1afc64f
+class/xoopseditor/sampleform.inc.php:803ee868038085e99cce6dca1be3195a
+class/xoopseditor/xoopseditor.inc.php:8f28c4e5766806a8405dc1aaba666795
+class/xoopseditor/xoopseditor.php:110f6eac831bedb043e1b697c9d751a8
+class/xoopseditor/dhtmlext/dhtmlext.php:3563948e03503ab9294ee6b72949c199
+class/xoopseditor/dhtmlext/editor_registry.php:d167298ad53a49ca1832e978770a4128
+class/xoopseditor/dhtmlext/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopseditor/dhtmlext/xoops.js:cddf1c472cb80c88cec786c1f3aa65b4
+class/xoopseditor/dhtmlext/images/iframe.gif:19c829f51f0f722e238173382ba9061a
+class/xoopseditor/dhtmlext/images/mmssrc.gif:f206fd63b10ef69cacf5b7f3fd6ec598
+class/xoopseditor/dhtmlext/images/rstpimg.gif:477423960a16fd22065ca6bc2f8f267a
+class/xoopseditor/dhtmlext/images/rtspimg.gif:487e6d95d5fe5570132ec584c7a65d1e
+class/xoopseditor/dhtmlext/images/smiley.gif:1287395d737618b03fce05e5fd21346a
+class/xoopseditor/dhtmlext/images/swf.gif:092132a0a431eabf81a9de1c4e8e8cb6
+class/xoopseditor/dhtmlext/images/wiki.gif:3130b6aaa7507b9fd81b68bd848e3b6c
+class/xoopseditor/dhtmlext/images/wmp.gif:54e39fb9923ad0897b0bca7f94b8665f
+class/xoopseditor/dhtmlext/images/youtube.gif:b89d9f1f80d391599c2485d091174934
+class/xoopseditor/dhtmlext/language/english.php:a3bf6cd37e5542ba0e4136517cf2a015
+class/xoopseditor/dhtmlext/language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopseditor/dhtmlext/language/schinese.php:297c379b40638df9106bc603eb2d7517
+class/xoopseditor/dhtmlext/language/schinese_utf8.php:fcc9d815fa060cb144133c9e1a4318e5
+class/xoopseditor/dhtmltextarea/dhtmltextarea.php:16c70e6fbfdd86119f0d4e365c9d53bb
+class/xoopseditor/dhtmltextarea/editor_registry.php:9c802826a03bc1029194b72f410e778c
+class/xoopseditor/dhtmltextarea/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopseditor/dhtmltextarea/language/english.php:a379f2fe1282e208ca9bf468b51e306c
+class/xoopseditor/dhtmltextarea/language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopseditor/dhtmltextarea/language/schinese.php:3cdc9a878cad27e1087331e662547e09
+class/xoopseditor/dhtmltextarea/language/schinese_utf8.php:7c5851611b90de0905be0d4c0894e710
+class/xoopseditor/textarea/editor_registry.php:272c65bb04d2c9e2e8fd06b042a85e99
+class/xoopseditor/textarea/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopseditor/textarea/textarea.php:3044f72ba121833ac843e77602e4b5b8
+class/xoopseditor/textarea/language/english.php:dc347ea9cc2f1c10177b8e6796012cc2
+class/xoopseditor/textarea/language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopseditor/textarea/language/schinese.php:302e19479be640c0a3f5867189fadde0
+class/xoopseditor/textarea/language/schinese_utf8.php:241a632d97ec8162d2d02a39803ef1fe
+class/xoopsform/form.php:816589e2530bea9587d8a64abeda4a32
+class/xoopsform/formbutton.php:46a32e7de68b73cc9bc553ffa24bd4c4
+class/xoopsform/formcaptcha.php:0b3ea9d24945738ad3c7ca65d0abb4ec
+class/xoopsform/formcheckbox.php:a2b5d41857e60b150c7da9f2d371b3bd
+class/xoopsform/formcolorpicker.php:6672f18d768a4885c04f516307a34fca
+class/xoopsform/formdatetime.php:ab3d59a6814de04a8a1caec00f65e467
+class/xoopsform/formdhtmltextarea.php:6a4af4e32f23fbca17f2d26e00b680bb
+class/xoopsform/formeditor.php:205c4948efdc4b2be764645fcba7fabc
+class/xoopsform/formelement.php:b4ca265a429e826816b7df769e2b72df
+class/xoopsform/formelementtray.php:3dc49cdea84b54a922ac473508af96aa
+class/xoopsform/formfile.php:767bffd17a106e06718d70c9f83b48f2
+class/xoopsform/formhidden.php:6c8b40eee767c874a0a1e723fc013ac8
+class/xoopsform/formhiddentoken.php:6401b80b37eb0b31cbe7918ad48eba81
+class/xoopsform/formlabel.php:f657ec792a71dce0e7535830cf408901
+class/xoopsform/formpassword.php:b112441c57d1951b55a3f1e59181ade8
+class/xoopsform/formradio.php:592adfdd04005731b742eef4f2d80469
+class/xoopsform/formradioyn.php:536b4676cbda03833707e9194d54fa92
+class/xoopsform/formselect.php:77f7732269dc58a648e6ad0863ece53f
+class/xoopsform/formselectcountry.php:377317109d3d59f1f7dc92471318d13a
+class/xoopsform/formselecteditor.php:f9ca7da5da54a8d3db94039e4d597c70
+class/xoopsform/formselectgroup.php:e0b2eb218807c0afe41f545ab5af5a92
+class/xoopsform/formselectlang.php:118e9a424f47076eee580781dc9eddd3
+class/xoopsform/formselectmatchoption.php:3f827ac7ac0b757f7dc739cd384d6d76
+class/xoopsform/formselecttheme.php:b23ed9031d0297bcea60a4c12c580c1a
+class/xoopsform/formselecttimezone.php:2c50b544a9dc7d3ad0708d66632bb1d7
+class/xoopsform/formselectuser.php:d6726584cbd2c5b25f3a04e2b97eacd5
+class/xoopsform/formtext.php:28e12613c63a173a39e711c4448f7fca
+class/xoopsform/formtextarea.php:ac56e5582a44d191b2d0824bf7edb3fe
+class/xoopsform/formtextdateselect.php:076e2932ec72cb8c55e1bb6a9ace431b
+class/xoopsform/grouppermform.php:c4d714598b68d54ee22280d9b9f13e1c
+class/xoopsform/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopsform/simpleform.php:dd7ae2588d712aa9cefd1828840fc208
+class/xoopsform/tableform.php:50aefba3cd5884cea65d3159c1cec5a9
+class/xoopsform/themeform.php:1f7458ca6f5fa330d2a3768c0a04fb75
+images/aligncenter.gif:bb4ebcca96cc5a1de79bb408c7e6c5cc
+images/alignleft.gif:ff0af550a83ac653585d44950ec70b3f
+images/alignright.gif:e04b2d584727efd58aab8d73714d72ac
+images/await.gif:1c0c3d8325ce4ec922f45af270fa9c9f
+images/blank.gif:49cdc214849d5ced018d230677b14076
+images/bold.gif:e31d50ee227a11bebad0548b0b249b11
+images/code.gif:a94e775403e103ee072bb0156c764a85
+images/download.gif:c04fdadc3ced3a2edd5500efef718dc0
+images/email.gif:fe89e3ab3eb6d727b8263a7c7f5607dc
+images/image.gif:c33a77dfcf9854badc3b03c9c1574e8b
+images/imgsrc.gif:2b38371f664340415c17f543de3a773e
+images/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+images/italic.gif:4fedc88a4abd21006d0f3a5cd420df33
+images/linethrough.gif:92c6ac927247cbb5f28a000063f07e25
+images/logo.gif:8160522197af080d9a1b371d33d332cc
+images/pagact.gif:f51e3a9657585db590aa7f5d635333a7
+images/paginact.gif:2f1e920d25355ded68276aaae7b475ab
+images/pagneutral.gif:f4a652f99c1bbee559558a0f3f538a7e
+images/password.gif:215da01f2231a51131f7e0d9bd66c3c2
+images/password.png:437a4b42c308e2a626ab2da253ab429a
+images/pointer.gif:273d7f89167b8ffcdd194201142ed75e
+images/poweredby.gif:7c366073172ada947f03dff837ea0909
+images/quote.gif:99237e4b3508bdbfd059ca5782449af0
+images/read.gif:f638ec47a2f4ace642b3bc60c7eb5ca1
+images/s_poweredby.gif:07076217a43b5d5391e6f28b5a600c3c
+images/smiley.gif:1287395d737618b03fce05e5fd21346a
+images/underline.gif:35445fc50b0232fe79e6cfd5982681dd
+images/url.gif:dc3afa4189a2ec1adcbaab147226f2b4
+images/banners/banner.swf:c14f8f4cb12fbd921e5d4451f960f659
+images/banners/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+images/banners/xoops_banner.gif:a6a7a8863fe206fcc3ed23abcb01bdc2
+images/banners/xoops_banner_2.gif:5f5b7a0fc35cfca5ba54607e234c684e
+images/banners/xoops_flashbanner2.swf:b42fabd727ff27e8bc9d2a688ce3a958
+images/icons/aim.gif:cd81264af3dae7ffe10ba8b97f4dbf19
+images/icons/delete.gif:4b69b271642b7e12d0202edfb5702a27
+images/icons/edit.gif:9421aa9bf118de1162fbf86f90b0bd0f
+images/icons/em_small.gif:812836d50b730612f15ed67cdbe3dde5
+images/icons/email.gif:78816153b1581a7a4b90a173a2e50c35
+images/icons/icq_add.gif:209ce74c8857ab590fd4b49870ea2176
+images/icons/index.html:d41d8cd98f00b204e9800998ecf8427e
+images/icons/ip.gif:80241af0de467445080abed8be24ce0c
+images/icons/msnm.gif:9410df9969db77b1c56e617a41ce0da9
+images/icons/no_posticon.gif:001dd4512e84f78e7602a69d927f5565
+images/icons/pm.gif:7ccff3870289fbeedbc83b307ca88215
+images/icons/pm_small.gif:38555bc09d5d1e2ca157dfbac7eb5c31
+images/icons/posticon.gif:a4e80a8318242d93cbf7af8168fbb31a
+images/icons/posticon2.gif:1efe12b5bcc935d779786aed9bf278fd
+images/icons/profile.gif:fcb50419904054fe696945d46c917b6d
+images/icons/reply.gif:6164de9d119a57ba12b96a80defc032e
+images/icons/www.gif:7a94b0ddaae324f6d90bd36ce3a16fe9
+images/icons/yim.gif:513f79d78a6ba18f0ccdc780f232768d
+images/subject/icon1.gif:edbc96679c5cece12383d7cedbd9f90f
+images/subject/icon2.gif:4cb0a57117dbd60e2306f5bd1f25daf4
+images/subject/icon3.gif:67b58a0671cfe672bc505fa54ffe9d02
+images/subject/icon4.gif:a23c478f5f20024c673c2d0d1b09ec66
+images/subject/icon5.gif:d6d3c9f5487bfaec1906fd6b937e0190
+images/subject/icon6.gif:258a7c3f56d11b2173e0983c2b2c5afd
+images/subject/icon7.gif:b30a99bfcfc15e2234c1c7d57958978c
+images/subject/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+include/calendar-blue.css:7ed93f5fe431d769ff10eebab95005f2
+include/calendar.js:4407b50bfdca13aad2db48124e27969b
+include/calendarjs.php:9ea808e1130d6d0e2dc834e7e21ae6a6
+include/checklogin.php:74c9591f92cb08ad951c087813f95274
+include/color-picker.html:d99044c7c8370cfc7a31074eb7f82d33
+include/color-picker.js:a591df12eee3b9266828d4873d64ea75
+include/comment_constants.php:e8ebfeb0b048d266026704a35c649d2e
+include/comment_delete.php:bad99d9a0840b05cb1e08b1b24d19cab
+include/comment_edit.php:8fc1d0f52dc080d812f510fc6cb48e26
+include/comment_form.php:5e7750bf0eb4148c8d76c9947ef01a1d
+include/comment_new.php:b69c9f56aafcd1b1a3b09417dffd99df
+include/comment_post.php:a57f54a5ae9646f26fae64e648606af0
+include/comment_reply.php:b21e5ada32b3c2c51c21b477b486d38c
+include/comment_view.php:858aef39848ed8bbc67da86ed4102e2a
+include/commentform.inc.php:33691b9e259c349a453e1222f194014a
+include/common.php:7137477ac7aebe516e09512a45e1c037
+include/cp_functions.php:1393db1664263b968dc8500c1c0f5dae
+include/cp_header.php:20a019616fe133a558319d6826ba304b
+include/findusers.php:ddb2851bbe84549435bd0ddc1ceac85c
+include/formdhtmltextarea.js:bb1028de193b68ae388ebbdd731d837e
+include/functions.legacy.php:60550451325471ab0628ac8bc9645666
+include/functions.php:842dd2a81b01782c2c0780a8245abddd
+include/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+include/layersmenu.js:6b6104b5450b8d4acb51531693b7cbdc
+include/notification_constants.php:f88b82a15659e8eb4c658805c5b60c29
+include/notification_functions.php:9c189ad6a66c9c895f4ac1ac05671581
+include/notification_select.php:3d389b30e1b10de1646edccb8c6c58ea
+include/notification_update.php:443dad3c6039ea8eeccbe9f9517623b2
+include/old_functions.php:d7e36d4730eb06c86c56d67637a724f3
+include/old_theme_functions.php:2425f93446f4c14ad690a8f46432ea18
+include/registerform.php:0c88aa48fb4ca155e936f70293c010f3
+include/searchform.php:35fc760aaf27cf0f566b871660130c21
+include/site-closed.php:0812b7d8690e9fae8debb1822916f9da
+include/version.php:be399ec313ce642e4fe11cca109c54d7
+include/xoops.js:a4d54795765563107818a82d74ad6461
+include/xoops13_header.php:0a1fccc399b6ad1c4e91b643ff679b8d
+include/xoopscodes.php:ed96551dba2538f4702c632949a5fee7
+include/xoopslocal.php:e3edf1eeff54889f52c6c8c3d273c4b2
+install/common.inc.php:ff1577a31e5c4c2085fc7ae44f4b5bb6
+install/index.php:e1042c8e765c7fd080f8dde93aeafcdc
+install/install_tpl.php:afcef99924fcda2615bde73d1a485643
+install/makedata.php:713448be14574e1a56fe5878215a5aba
+install/page_configsave.php:3bf928bef85a11b003e5069df892ee27
+install/page_dbconnection.php:edd5f94c686a6edd3d76df196be82ab2
+install/page_dbsettings.php:e5bb2b413c88d592a0718eddf67347fa
+install/page_end.php:e3b139c69528ba883ef61ff84cccc573
+install/page_langselect.php:ab38e859a2fb96cf200803182e34fb9b
+install/page_modcheck.php:c5ebfa0403da4613178cd9261f61d77e
+install/page_pathsettings.php:1a429cd415476d4a998fc4e30725bff7
+install/page_siteinit.php:8851c2bd8ed3931d8c860c9122ee9288
+install/page_start.php:929fa3528a2ce2a615d79229eb0af82e
+install/page_tablescreate.php:ee0006b10fc9725e25d98fa8eb87591b
+install/page_tablesfill.php:75a1bfa29b6aeb32a19e47a2a043af84
+install/prototype.js:725cd09eb6cca738be202daa99d2d328
+install/style.css:426c397e1806c1a0c6da645749dce11b
+install/class/cachemanager.php:c0777b530239631fd5b57c0f2c6f9a20
+install/class/dbmanager.php:f055b5c03bad93e87db2a4e8e14077c4
+install/img/background.png:5e6cfab195a365ccd64e6c78c7e8a0fa
+install/img/banner_bg.png:57ebc65ff31121b3076d570763386cde
+install/img/bg-globalnav.png:f7084628e4495f221a8c4603d8123994
+install/img/bullet-current.png:ceee0b9adeb5034ee48a86bda2b96f43
+install/img/bullet-disabled.png:939624512c9f502663faeaa7b00a0f94
+install/img/bullet.png:ee16afaa682be781e3b7a90627703b2e
+install/img/ffffff-25.png:0d215c5a3b5cdc55e3df16e532a2b79e
+install/img/ffffff-75.png:406a6b71c7d68a0526a4eceb3611db77
+install/img/form-input.png:1424c859540d25a573186837ab1a2c71
+install/img/help.png:fece82d3daab5a675dbe7b2e43ce93d3
+install/img/logo.png:a4947e6b5a85ebd455e6c57df3efcfa6
+install/img/no.png:4030bc31d1c7b2913cca485ca73b7f37
+install/img/no_big.png:e13b006fc96cc776c33a40b1f6b5088a
+install/img/shadow.png:28debec6840246da8cc8447812718a55
+install/img/table-caption-grey.png:a2d2b7b74d69fd4e9acae22d14428b15
+install/img/title-bl.png:845723ddc7c520900ec61f6526c60d64
+install/img/title-br.png:978be2a3159765d702c31eb8e78e86de
+install/img/title-inner.png:c3974cc6e7661056a5812c3155d0a082
+install/img/title-tl.png:f995ea9b3ab178fabed4327c3c224d2b
+install/img/title-tr.png:acf0ada1a0994923469a7b2816ffa7ae
+install/img/warning.png:ca95dbb194b7ed1caf023b70f065b005
+install/img/wizard_bg.png:8a619770436deb35a3f5d43a3b961c79
+install/img/yes.png:17a7c02613520ba4f6ff2be37dd89142
+install/img/yes_big.png:6ff40c5837149fc4382372461c442ce1
+install/language/english/finish.php:f99e23fdcb257c3d7bcbe52bf6e7814f
+install/language/english/install.php:6cd3aa1443daa08cc159e156983e6e37
+install/language/english/install2.php:ba3a506d13a3106ff3110dceafe7b8cd
+install/language/english/mysql.lang.data.sql:9e3d8780e29bad64f37ccd0ab782404f
+install/language/english/welcome.php:04e5bd3556eff8a14ca687fa84f6f638
+install/sql/mysql.data.sql:723c86837417f10f91d5da42ea981e45
+install/sql/mysql.structure.sql:a71b9cafb4245e3325e7e0c8076444d9
+kernel/avatar.php:0bdcc22b4dc3f14682a9eaf16f1b2b06
+kernel/block.php:15017655415fd8b14dd4dc4933d2c863
+kernel/comment.php:5eb73a532a4cf6dc8b6122afc102b736
+kernel/config.php:ef52203e0d82bb941010565890891665
+kernel/configcategory.php:a3563da86748e2852638220bc929284c
+kernel/configitem.php:245adc7626f56d35bcc6ff3f896d6296
+kernel/configoption.php:383b4c74ac61c5f642ef63a1f5c466bc
+kernel/group.php:538e927b3f2eb95a12312a003b64093e
+kernel/groupperm.php:d28b7605edb8152d4488ef17ca571d08
+kernel/handlerregistry.php:16311d220d32632dbcdf95c0acca4d25
+kernel/image.php:e72402851a05d081aa65dbcdfc1a6906
+kernel/imagecategory.php:7d3017bae145b6b408c7ab87ece1259d
+kernel/imageset.php:c3b1be094772e8003d353656ef3a96ab
+kernel/imagesetimg.php:769a45f22a10f471c23b5f0244b4d5ff
+kernel/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+kernel/member.php:931145d95d0c59e258cbcb4b54560daa
+kernel/module.php:2a5f8f7a404ea58127af17333574406f
+kernel/notification.php:8e25637806149c132dbdd2f219bfdcc1
+kernel/object.php:5db8c7e73d2b61b8340d6136a7782cbe
+kernel/online.php:d239531d88115778e1f4d7640b8d2d6c
+kernel/privmessage.php:72b58733886194138baf83e95c76ef44
+kernel/session.php:06762492c12d49f899d3349f84579a8e
+kernel/tplfile.php:7a77f9d03389a4ceaa0abd44d9045456
+kernel/tplset.php:524e66fbcc5d26e6111d3d47e63e7b54
+kernel/user.php:da0fc001d007f81feacb499e37c5e8a2
+language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+language/english/admin.php:2fb675922b334073dca21900c4dfbe45
+language/english/auth.php:23904fbe13d9bdb516581ba85d417cc6
+language/english/banners.php:e0dee24f30ccfa33a247d29c230218e7
+language/english/calendar.php:a6cfd3c8f69ca5dcaa71c652948ec769
+language/english/captcha.php:ce768375e92bf9cdbb43eb50511e56aa
+language/english/comment.php:78a292b94d7edd4a2ff3583813a025f5
+language/english/findusers.php:59e063c33c810f97878eb0e0d0191d7d
+language/english/formdhtmltextarea.php:786de14b561a7be8fef717782b187adc
+language/english/global.php:d75a23053db1a8d7f829d70fa642f339
+language/english/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+language/english/locale.php:f3084b9d5ff84357f28207fead85d7c2
+language/english/mail.php:4757c008a96074cdc7737640fd4045ba
+language/english/misc.php:267596bbaf027f9ef661e7b0b499ba8a
+language/english/notification.php:b87e470913e8f0bf7603eb5e686c43e8
+language/english/pmsg.php:20e3f72681e172c1dffafde4aaf0ef9c
+language/english/search.php:543546cc018db3827986caef4769df95
+language/english/timezone.php:02cc757309ca702779c6b40d1ff49f8f
+language/english/uploader.php:2f967539749f28c51b736db308459968
+language/english/user.php:1c563bf817efc2ee15573e3bab504a3e
+language/english/xoopsmailerlocal.php:02a73544130c4ede9b60c968a21fdac2
+language/english/mail_template/activated.tpl:46797b78f7657cdbac568bd81a2b689d
+language/english/mail_template/adminactivate.tpl:ec1780a81f1ad5b46880d35a62d32fed
+language/english/mail_template/comment_notify.tpl:5b8449c9d34eba7d38ca7aeedb2a9c5e
+language/english/mail_template/commentsubmit_notify.tpl:3f4ea62032595735d8aae17e3543956d
+language/english/mail_template/default_notify.tpl:7feeae7c49d49afd59c76a91eb4607d8
+language/english/mail_template/lostpass1.tpl:b534eab203f2b67d1998cee3d9235209
+language/english/mail_template/lostpass2.tpl:10ff980e536b527a4bf4a36082b30cf1
+language/english/mail_template/register.tpl:03e25fad3007793698a8b64e91bb2215
+language/english/mail_template/tellfriend.tpl:1cae062a85c2f1d21c889e9137545586
+language/english/mail_template/welcome.tpl:74b3dfc840aebe2c87fa9e7a5f00056a
+modules/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin.php:a01cd7d7f37e0964aac3bafd63ac32df
+modules/system/constants.php:0bccedeb4df540ba1f756a62e8edbe2c
+modules/system/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/menu.php:16a9d4e907194d253a998551901cf0ff
+modules/system/style.css:d5689bd5b2a5062030c76f4f38995019
+modules/system/xoops_version.php:f3669e0fd4442bc6ad03b54aa8e6e3bd
+modules/system/admin/groupperm.php:9c077c72e06cd183cff82c6eed21ecff
+modules/system/admin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/avatars/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/avatars/main.php:01393fc83270d4e01258ee102f6a7eb3
+modules/system/admin/avatars/xoops_version.php:b66cb0acdda08c10cdc4ce6806dd9ec1
+modules/system/admin/banners/banners.php:f7514a29ef1a3101592842adcec12381
+modules/system/admin/banners/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/banners/main.php:51b12f78f8bc27c9124e3e3ab2898ee7
+modules/system/admin/banners/xoops_version.php:eb2d666b4766c938a537d9e0a03cea6d
+modules/system/admin/blocksadmin/blockform.php:22e8d01d4b10a1c6e7f82deed2c2b1e3
+modules/system/admin/blocksadmin/blocksadmin.php:c23aec12ea2f756e62a4a74ead251f47
+modules/system/admin/blocksadmin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/blocksadmin/main.php:97d63e36e9e520c53b3b4dfced71e868
+modules/system/admin/blocksadmin/xoops_version.php:d5596d9e8e207ecba2dcd1ccd259358f
+modules/system/admin/comments/admin_header.php:c2603a9a6bfc0218a9086bf229300d90
+modules/system/admin/comments/comment_delete.php:69f356b05ae46679dbadc431564be472
+modules/system/admin/comments/comment_edit.php:0915239e30bb4eb68a11b5028a25f981
+modules/system/admin/comments/comment_post.php:93065c264e59869d9cbe9bd25d152f2c
+modules/system/admin/comments/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/comments/main.php:9f0b18b564c830e4642bc71eedbc1248
+modules/system/admin/comments/xoops_version.php:739c7c1f4d699e0843b958ff369a1298
+modules/system/admin/findusers/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/findusers/main.php:30fa50af34501ab6586bd086ae6ae5c7
+modules/system/admin/findusers/xoops_version.php:8684706f49ae1e34f95801757dc0dc10
+modules/system/admin/groups/groupform.php:6dc89447cabf4ef6ab00e9d6e033e6af
+modules/system/admin/groups/groups.php:6aba199785063912cdc2a2132e92abab
+modules/system/admin/groups/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/groups/main.php:93255bfd413e908f727f258aadb89263
+modules/system/admin/groups/xoops_version.php:427f1bb3d263e5c423add1660f88efa0
+modules/system/admin/images/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/images/main.php:dba41dbe69adafe01bb896677b0c6fec
+modules/system/admin/images/xoops_version.php:2f42aab480a523d7fc25f0477fa8f43b
+modules/system/admin/mailusers/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/mailusers/mailform.php:e4af3cc4c3bb135255a46b12ee9ab0c7
+modules/system/admin/mailusers/mailusers.php:6aacf59ac334292940fee4cc8a6b6cad
+modules/system/admin/mailusers/main.php:4dab556cdb7f0e7ebd0d5b2b71014338
+modules/system/admin/mailusers/xoops_version.php:79af4e4212a829198d436510ed9bd302
+modules/system/admin/modulesadmin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/modulesadmin/main.php:915fab0845a7ec81f129495035a0acbe
+modules/system/admin/modulesadmin/modulesadmin.php:5c2954cf0e2389cd02e7951944c28ff4
+modules/system/admin/modulesadmin/xoops_version.php:c4bb6acd39d36a783f324087677409d8
+modules/system/admin/preferences/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/preferences/main.php:88a8efd0eb6e616d0b3f3c71a60d8821
+modules/system/admin/preferences/xoops_version.php:17f569a1ab3fc4fcc469b177df62be9d
+modules/system/admin/smilies/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/smilies/main.php:bc1e7bbb115d3978d30106753e364baa
+modules/system/admin/smilies/smileform.php:b5958d7916aea117a7943c1c038a6bc7
+modules/system/admin/smilies/smilies.php:61548b05924722ec40bfb91429f3b208
+modules/system/admin/smilies/xoops_version.php:6804bd945f642f0142eb9bc482ae289d
+modules/system/admin/tplsets/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/tplsets/main.php:4730e920b9a252836864202129082d6e
+modules/system/admin/tplsets/themeimgform.php:224d85309c6e8abf9ea01505f5690dfc
+modules/system/admin/tplsets/tplform.php:fa46ee8869f0dbd2c62c8075e048d090
+modules/system/admin/tplsets/xoops_version.php:56d731885b5b168e4554d7d9f170fab0
+modules/system/admin/userrank/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/userrank/main.php:87e2808fbeb26ded43ee133206ff7200
+modules/system/admin/userrank/rankform.php:38111d9cce1f4c9414ba535bc5316e44
+modules/system/admin/userrank/userrank.php:daafb9de170810b5a23c4159cd54d9ee
+modules/system/admin/userrank/xoops_version.php:450849a107ef4e5c893a3b54d6685b23
+modules/system/admin/users/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/users/main.php:99a567ce1a3baf1f7ee3d1d9847cbb89
+modules/system/admin/users/userform.php:88b323c8894de1c0d90a624805d1d3a5
+modules/system/admin/users/users.php:5f534abfcc3990c9d4710290fede05c4
+modules/system/admin/users/xoops_version.php:c88d4d9768d7c34b9551e25d8e5f4468
+modules/system/admin/version/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/version/main.php:fbf231c7fdeea0a7f976cf9d23422732
+modules/system/admin/version/s_poweredby.gif:a0f5d8c3fe55e7a1f75febc41c4cfe36
+modules/system/admin/version/xoops_version.php:ee14a9c5cd29351c12154faf073f92f4
+modules/system/blocks/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/blocks/system_blocks.php:7f998bfc8e5b45b2aa5eb08dfb9f1c9d
+modules/system/class/cpanel.php:085943dcf3a2815b5df2115a4b91804a
+modules/system/class/gui.php:573f7819acaeeab0284cadd6d01fa8eb
+modules/system/class/readme.txt:2f828535b997546618c098d770bd3e39
+modules/system/class/gui/gui.php:8d5ae375bae33d419191bc7db18a1e2f
+modules/system/class/gui/legacy/cp_functions.php:8565ee31d2b42f44a856890ca4150bf0
+modules/system/class/gui/legacy/legacy.php:2b5d368998b15a2b3f86395706a8e8ed
+modules/system/class/gui/thadmin/thadmin.php:ec37bc62c4443308a75bc2c8d0aa253d
+modules/system/images/bg_content.gif:a97c90b4ce1ab15d10dcf8f8927b6c1f
+modules/system/images/bg_menu.gif:2fd50fce6348582c5d601c1b25c2a666
+modules/system/images/check.gif:9205e050618556e4e047ebdc46eab920
+modules/system/images/hbar_left.gif:6583933a751a8523bcaa067abb4d2dfc
+modules/system/images/hbar_middle.gif:6c1e7e05afe5d789b30cd5dc5931fc3d
+modules/system/images/hbar_right.gif:8079f8c7977c299b1cdcbf86837214b9
+modules/system/images/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/images/info.gif:afa24809dcf1ea8a4ff64497817ec228
+modules/system/images/install.gif:b41b04de51ace26e5072af2ccf8dc044
+modules/system/images/logo.gif:68b0f7df1758ceab6cda45ae9ab061bb
+modules/system/images/menu.gif:0c7001cb38521a47fdc12472f0347b50
+modules/system/images/powered_by_xoops.gif:10664840713f8cf395132c7393e23771
+modules/system/images/system_slogo.png:5a3d96a11b621135b4a7585ad3d5da8e
+modules/system/images/uninstall.gif:06931e931ad0d72c42689941cef55168
+modules/system/images/update.gif:89bf3db55057fc277cca8df0584fb884
+modules/system/images/xoops2.gif:5e8024e9cd03478842dbd34b09f2b2ba
+modules/system/include/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/include/update.php:2f1d935ac08cd68aef8fb734173e25ee
+modules/system/language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/language/english/admin.php:7178b706ab27b9136e6efbb8e3e30c71
+modules/system/language/english/blocks.php:5a0eaa97f9874b286a00c22b096f316b
+modules/system/language/english/cpanel.php:4b9d12df4933a9434e2363fea251966c
+modules/system/language/english/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/language/english/modinfo.php:d0b59fe98f3d8a7722fdaf8d58ac77e1
+modules/system/language/english/admin/avatars.php:5896e339596b26b564d724aac168a6b2
+modules/system/language/english/admin/banners.php:e31f46df7e6fe62ea1a8ca073382f0ed
+modules/system/language/english/admin/blocksadmin.php:e8d0fc76dec4c9f1b2dc3d8a8f20a1f9
+modules/system/language/english/admin/comments.php:565a2f21919761290e53d2cadb0d5cbf
+modules/system/language/english/admin/findusers.php:903fbc98f9d0707203a167cda19e71f9
+modules/system/language/english/admin/groups.php:8a812a43ee3570942f97963ef88b5295
+modules/system/language/english/admin/images.php:e6424e51bc4763a965e15e925af08b33
+modules/system/language/english/admin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/language/english/admin/mailusers.php:242c16d3b1f039315e01600ee6fa6122
+modules/system/language/english/admin/modulesadmin.php:557ee231243b226230013e8878dc9edb
+modules/system/language/english/admin/preferences.php:d51627e7cd298b70100903baeab9bcf2
+modules/system/language/english/admin/smilies.php:74e06c85c7b5a6cc1b38586b84ebd5da
+modules/system/language/english/admin/tplsets.php:4c1d4c4ef24a295e241085011db8b625
+modules/system/language/english/admin/userrank.php:1e85f9db5051eb5fa886141c2dc766ca
+modules/system/language/english/admin/users.php:1f592798b210c679b03149a75570f917
+modules/system/language/english/admin/version.php:79075615abe0de9de77e09a76db87915
+modules/system/templates/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/templates/system_block_dummy.html:2f0dd2b3b057f92c4373431344b78a8f
+modules/system/templates/system_comment.html:55729df1bbea6ece1f89cd4d52daf887
+modules/system/templates/system_comments_flat.html:8082f1a327b37cfc9192f2bc4e517143
+modules/system/templates/system_comments_nest.html:df7c391baa2d2eb5f8c79640407096c6
+modules/system/templates/system_comments_thread.html:ab33114289b7ccfe99f6b6fa7082e01c
+modules/system/templates/system_dummy.html:8579612e81de7e772e4c70ff02ee06ad
+modules/system/templates/system_imagemanager.html:b99ab7f39bd931947658f10c3fa309a8
+modules/system/templates/system_imagemanager2.html:3821556eadbd048cafd09d92f739e586
+modules/system/templates/system_notification_list.html:4119c5ea52529b217212dba41ea7c413
+modules/system/templates/system_notification_select.html:eb5081837fd97637d2bdd4708faf3473
+modules/system/templates/system_redirect.html:49005fffa076c7b613ab75fe1d16fbc5
+modules/system/templates/system_rss.html:78f564e0246ac96b97654c8a28fc9b28
+modules/system/templates/system_siteclosed.html:5a6a9a09fa79e8464c552dc473b329c6
+modules/system/templates/system_userform.html:a5fc9b43cefd6d02f014d2bc8104e5ca
+modules/system/templates/system_userinfo.html:4a16ee0210e6121661b86a39040b91d2
+modules/system/templates/blocks/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/templates/blocks/system_block_comments.html:20518f74f2fe3f5f00206e5b808e1ae2
+modules/system/templates/blocks/system_block_login.html:06c8025c36752b708ac156a560203204
+modules/system/templates/blocks/system_block_mainmenu.html:ec5dbea67758323518144690e65dfd7c
+modules/system/templates/blocks/system_block_newusers.html:c4d518edffb6b3d9337a2bd5df09aff5
+modules/system/templates/blocks/system_block_notification.html:1f91e94ab34d9844380f87973c688721
+modules/system/templates/blocks/system_block_online.html:2101de303fd29e7e3ddc4f9d2ee90985
+modules/system/templates/blocks/system_block_search.html:5a9c9ad1c706551907beaf113e94738e
+modules/system/templates/blocks/system_block_siteinfo.html:5222881c4a9a5c7ec15b7d0f415a4b68
+modules/system/templates/blocks/system_block_themes.html:cf09f1ee160403702f50b78d85e9d779
+modules/system/templates/blocks/system_block_topusers.html:c8af85c7367820798727f1f3206f9a20
+modules/system/templates/blocks/system_block_user.html:725872bef06d2f7cd4286ef527de326e
+modules/system/templates/blocks/system_block_waiting.html:90c19fdef5106cee9207b3bca9ece7bd
+themes/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/default/hbar.gif:ea1305a8064d975f413725b07c9b288d
+themes/default/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/default/logo.gif:8160522197af080d9a1b371d33d332cc
+themes/default/poweredby.gif:10664840713f8cf395132c7393e23771
+themes/default/screenshot.png:973c1d482f5ee67654e4230242d66c14
+themes/default/style.css:dd8a55a9d357f1e351616c17603fe3e6
+themes/default/styleMAC.css:46a9cfe1d4203e64dabafa63661df0ea
+themes/default/styleNN.css:d243a11efd6768e653b3d619b4b2f89c
+themes/default/theme.html:b5b0d2609773102fcaffafc979d4f354
+themes/default/theme_blockcenter_c.html:1e946aa6661ae69de258e5739d97a5c1
+themes/default/theme_blockcenter_l.html:9d780bf18020563b7eb6371bdfe78610
+themes/default/theme_blockcenter_r.html:b8bb32b403f62171b1764a1e60e29646
+themes/default/theme_blockleft.html:9d7a705b1998ceeafff739061668a837
+themes/default/theme_blockright.html:9d7a705b1998ceeafff739061668a837
+themes/default/xo-banner_bg.png:608297aa53168605da14446af71bcedd
+themes/default/xo-info.php:a68c44b7a8a30eae4078a64b2711e9ac
+themes/default/xoops-logo.png:2a95d873250f66d68f9a97c77b7208e3
+themes/default/xoops-logo.psd:00a4d0f9fa843f9ae1068a86f1adf8d6
+themes/default/icons/favicon.ico:9187f6607b402df8bbc2aeb69a07bbca
+themes/zetagenesis/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/zetagenesis/screenshot.gif:a54185b2a6088401b58346fbe6aba22f
+themes/zetagenesis/theme.html:6722f1914e4914c97520a2f94e1b01be
+themes/zetagenesis/css/blocks.css:a76bf29de1f0bfdbbc49dc342d3cc62f
+themes/zetagenesis/css/content.css:c28d3a61e9664135ad5ded8c22e16056
+themes/zetagenesis/css/forms.css:653d263ee30dfb9b1ffac7cb6a8fc5f1
+themes/zetagenesis/css/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/zetagenesis/css/layout-soup.css:02f97b9475a1b13f6a8b61e127dfa773
+themes/zetagenesis/css/style.css:5ac44b7498217727d52d5fa6a044db9b
+themes/zetagenesis/css/xosystpl.css:b07014fe2a0d98c94ef7d968be4986f2
+themes/zetagenesis/icons/favicon.ico:9187f6607b402df8bbc2aeb69a07bbca
+themes/zetagenesis/icons/icon.png:7865b5291ae4b2cd9991678a33aaa5d9
+themes/zetagenesis/icons/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/icons/action/friend.png:7f91d086cec59ec6a5c860efc87f7fda
+themes/zetagenesis/icons/action/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/icons/action/pdf.png:b76b24eb68a0f8e68aae636052d5a066
+themes/zetagenesis/icons/action/printable.png:6694a37dde93c3cd97c645bbcc8fb576
+themes/zetagenesis/icons/users/configuration.png:6b93650f109a049ffefa212d68e8d945
+themes/zetagenesis/icons/users/exit.png:f8f910d70b0fa37d920edd2e6fe14677
+themes/zetagenesis/icons/users/home.png:cb8ae929af5aea12f76ca7db1b230278
+themes/zetagenesis/icons/users/inbox-full.png:8ef7ea278b29298565dbf4d47ed63f63
+themes/zetagenesis/icons/users/inbox.png:cca778aa387e7f21c60501db68178c80
+themes/zetagenesis/icons/users/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/icons/users/profile.png:581ee1c52a05a9b9ad84b2d2ac88b988
+themes/zetagenesis/img/bg-ad-top.png:486714192a73656b8faeb0eb9d8cf46d
+themes/zetagenesis/img/bg-left_block.png:0d5bda4dfb311d651dab456b545ea462
+themes/zetagenesis/img/bg-left_blockcontent.gif:bbbe9e946f499507236693df0c6a475e
+themes/zetagenesis/img/bg-left_blocktitle.png:db3ffdbee79b86b24aa3cfb5e9c33bcd
+themes/zetagenesis/img/blank.gif:56398e76be6355ad5999b262208a17c9
+themes/zetagenesis/img/button-hover_bg.png:3e1f1d06b8ac51458c3290714d623269
+themes/zetagenesis/img/button_bg.png:91144890fe732afc173d47cae1cfcc90
+themes/zetagenesis/img/centerblock-bl.png:a6856504267ddd82142fd484b03bf6f7
+themes/zetagenesis/img/centerblock-br.png:b83f4b98281233afcefe24d1eb69b8ca
+themes/zetagenesis/img/centerblock-inner.png:6033971afcf64c9f22c089201e351aa1
+themes/zetagenesis/img/centerblock-inner_old.png:a29b810735610f4541e0e34a6086ab26
+themes/zetagenesis/img/centerblock-tl.png:985d046436561af3beadbc6ae6e80cca
+themes/zetagenesis/img/centerblock-tr.png:0fb39178435922b8f9f450bfc80ddb3c
+themes/zetagenesis/img/form-button.png:be5193e11b92b912d1ad507141ab62ca
+themes/zetagenesis/img/form-input.png:1424c859540d25a573186837ab1a2c71
+themes/zetagenesis/img/header-bg-small.png:760807c72701b6715ea9920e14a5446e
+themes/zetagenesis/img/header-bg.png:e643f61bd05f90838c2cfc3418131f96
+themes/zetagenesis/img/header-bg_big.png:e2e731e26f2552b729eb1a613799682c
+themes/zetagenesis/img/header-bg_small.png:ce93ce5d607ec7e3804a097d388c65c2
+themes/zetagenesis/img/header-logo.png:a4947e6b5a85ebd455e6c57df3efcfa6
+themes/zetagenesis/img/header-logo_big.png:f747717447f559415fb0c878373492b2
+themes/zetagenesis/img/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/img/input_bg.png:de3ec846411784c8c921cdb22e7e841d
+themes/zetagenesis/img/navbar-bg.png:61ee95b106db573ba2140f71152e5481
+themes/zetagenesis/img/table-caption3.png:cb88726ef3771835334702e3c15ce9ad
+themes/zetagenesis/img/table-caption_grey.png:8610d845de656a92360ef29785f509bb
+themes/zetagenesis/xotpl/blockszone.html:1a617e37a439fc98d9cbccb7d85c8737
+themes/zetagenesis/xotpl/centerblocks.html:d9971ded9fcf53384be05006f36ca800
+themes/zetagenesis/xotpl/globalnav.html:b52291573a2f15ddb33cac307f320aba
+themes/zetagenesis/xotpl/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/zetagenesis/xotpl/userbar.html:2d3a3a5775d3fe1fe8c693224342cc6b
+themes/zetagenesis/xotpl/xobanner.html:e6c5bc9c767560875346e4d66267c92b
+themes/zetagenesis/xotpl/xobanner_commercial.html:98ecbf8bb6c4b2fa52e1975109044f9b
+themes/zetagenesis/xotpl/xofooter.html:0e33c118640f82a8316dd29d287d48af
+themes/zetagenesis/xotpl/xometas.html:a1dc58093e00d1d577040fdc8c49ee64
+themes/zetagenesis/xotpl/xoscripts.html:13c22c31cf33be0132eae18947a37810
+uploads/blank.gif:84231d04ae6cacc6ed16c33dafd41060
+uploads/index.html:d4d788249d08e2e8b07210aa65cb614d
+uploads/rank3dbf8e94a6f72.gif:6c1a6c0edb7d1249d35b5bdf251edd56
+uploads/rank3dbf8e9e7d88d.gif:7b0be5af1fe7e67a5d49ccc478c67892
+uploads/rank3dbf8ea81e642.gif:aaf1c573f2342db58fb2c93a95ec301b
+uploads/rank3dbf8eb1a72e7.gif:ebe9ad801693044e173bfee4c9f857a6
+uploads/rank3dbf8edf15093.gif:556c283a3bb6e9436ee5608806dd8300
+uploads/rank3dbf8ee8681cd.gif:93bc3e2d9742830f21e2d2669a02e1d4
+uploads/rank3e632f95e81ca.gif:7dcfd082df9101d5d17259cd2019b9e2
+uploads/smil3dbd4bf386b36.gif:c67d0a9a30d389803083173d3b48af3f
+uploads/smil3dbd4d4e4c4f2.gif:eb02be2be01d18e9aefa2fc24e56fe2e
+uploads/smil3dbd4d6422f04.gif:6fffafd259b3f9afea2b9a01fcab6a5d
+uploads/smil3dbd4d75edb5e.gif:f5d15499d72340a16a633ae3bdb904e3
+uploads/smil3dbd4d8676346.gif:cf510276304ac481a309a9264cd12c88
+uploads/smil3dbd4d99c6eaa.gif:71032099437bcb91c7db2454a945968e
+uploads/smil3dbd4daabd491.gif:542513dc092433785adc39551797a5e0
+uploads/smil3dbd4dbc14f3f.gif:96ab8db2c7f53dae6f16f9f57a6774f6
+uploads/smil3dbd4dcd7b9f4.gif:b86966d5388cafa840df97d612160a52
+uploads/smil3dbd4ddd6835f.gif:d759013e6300998e1d50809fefe74f63
+uploads/smil3dbd4df1944ee.gif:cc106a7720659a43101e88f1396164ff
+uploads/smil3dbd4e02c5440.gif:8a0d4a3156dd0b62d9938353b8ab6b3c
+uploads/smil3dbd4e1748cc9.gif:6ee742e5394c492d63e788e0324bb356
+uploads/smil3dbd4e29bbcc7.gif:7cc2d45f8519febdcd7b16b1c86b06ce
+uploads/smil3dbd4e398ff7b.gif:80b46fcece3e365f802bb7888d2c627b
+uploads/smil3dbd4e4c2e742.gif:66a836ab9f55bd0d2d26a7be4a61ee71
+uploads/smil3dbd4e5e7563a.gif:6a91c1f7ee2b22e76b1307a749dc384e
+uploads/smil3dbd4e7853679.gif:be512685750f001d13e3c5f50e036132
+xoops_data/index.html:d41d8cd98f00b204e9800998ecf8427e
+xoops_data/readme.txt:82eb20ec3882eef08d1db8f810f3dda0
+xoops_data/caches/index.html:d41d8cd98f00b204e9800998ecf8427e
+xoops_data/caches/smarty_cache/index.html:d41d8cd98f00b204e9800998ecf8427e
+xoops_data/caches/smarty_compile/index.html:d41d8cd98f00b204e9800998ecf8427e
+xoops_data/caches/xoops_cache/index.html:d41d8cd98f00b204e9800998ecf8427e
+xoops_data/configs/index.html:d41d8cd98f00b204e9800998ecf8427e
+xoops_data/configs/xoopsconfig.php:a24d8b2f1762eb538093ca4d0c3466ce
+xoops_lib/readme.txt:1aec7183e0da25a5d5bc4b641968aafe
Added: XoopsCore/releases/2.3.0-rc/checksum.php
===================================================================
--- XoopsCore/releases/2.3.0-rc/checksum.php (rev 0)
+++ XoopsCore/releases/2.3.0-rc/checksum.php 2008-07-27 11:05:48 UTC (rev 1917)
@@ -0,0 +1,70 @@
+<?php
+/**
+* XOOPS installation md5 checksumminig script
+*
+* This script allows you to check that the XOOPS system files have been correctly uploaded.
+* It reads all the XOOPS files and reports missing or invalid ones.
+*
+* Instructions:
+* - Upload this script and xoops.md5 to your XOOPS documents root
+* - Access it using a browser
+* - Re-upload missing/invalid files
+*
+* @copyright The XOOPS Project http://xoops.sf.net/
+* @license http://www.fsf.org/copyleft/gpl.html GNU public license
+* @author Skalpa Keo <sk...@xo...>
+* @author phppp <ph...@us...>
+* @since 2.0.14
+* @version $Id $
+* @package xoops
+*/
+
+error_reporting( 0 );
+
+header( "Content-type: text/plain" );
+
+$md5_file = "./checksum.md5";
+$root = ( is_dir("./htdocs") ? "./htdocs" : "." );
+if ( isset($_GET["root"]) && false === strpos($_GET["root"], "..") ) {
+ $root .= "/" . $_GET["root"];
+ $md5_file = "./checksum.".str_replace("/", "-", $_GET["root"]).".md5";
+}
+$num_files = check_folder($root);
+
+echo "There are {$num_files} files checked.\n";
+echo "Please remove the file $md5_file and ".basename(__FILE__)." as soon as possible.\n";
+
+function check_file ($line, $path = ".")
+{
+ list( $file, $sum ) = explode( ":", $line, 2 );
+ if ( substr( $file, 0, 7 ) == 'htdocs/' ) {
+ $file = substr( $file, 7 );
+ } else {
+ $file = $path."/".$file;
+ }
+ if ( !file_exists( $file ) ) {
+ echo "$file missing !\n";
+ } else {
+ $txt = file_get_contents( "$file" );
+ $txt = str_replace( array( "\r\n", "\r" ), "\n", $txt );
+ if ( md5($txt) != $sum ) {
+ echo "$file content invalid\n";
+ }
+ }
+}
+
+function check_folder( $path = '.', $recursive = false ) {
+ global $md5_file;
+ $num_files = 0;
+ if ( !is_file( $md5_file ) || !is_readable( $md5_file ) ) {
+ echo "$md5_file file not found.\n";
+ return false;
+ }
+ $sums = explode( "\n", rtrim( file_get_contents( $md5_file ) ) );
+ foreach ( $sums as $line ) {
+ check_file ($line, $path);
+ $num_files ++;
+ }
+
+ return $num_files;
+}
Added: XoopsCore/releases/2.3.0-rc/release_notes.txt
===================================================================
--- XoopsCore/releases/2.3.0-rc/release_notes.txt (rev 0)
+++ XoopsCore/releases/2.3.0-rc/release_notes.txt 2008-07-27 11:05:48 UTC (rev 1917)
@@ -0,0 +1,160 @@
+
+XOOPS 2.3.0 RC release notes
+------------------------------------------------------------------------------
+
+The XOOPS Development Team is pleased to announce the release of XOOPS 2.3.0 RC.
+The objective of XOOPS 2.3 releases is to merge the two existent branches of 2.0 and 2.2 and to build a bridge towards our next generation of system XOOPS 3.0.
+With XOOPS 2.3 releases, users will be able to learn some of new features that will be available in XOOPS 3.0, while developers can understand better the direction of XOOPS development, and designers can learn what features will be supported in the future.
+Both backward and forward compatibility will be guaranteed as much as possible. Modules written for 2.0.* and 2.2.* will work with 2.3; applications developed for 2.3 will be compatible with XOOPS 3.0 automatically.
+Developers are encouraged to write their application modules on XOOPS 2.3 so they can incorporate some of the new features and ensure easy migration to XOOPS 3.0.
+The RC release is freezing the key features for this release with some minor improvements introduced in the specific release.
+
+
+What's New for Developers
+-----------------------------------
+
+1 Improved ...
[truncated message content] |
|
From: <ph...@us...> - 2008-07-27 11:04:04
|
Revision: 1916
http://xoops.svn.sourceforge.net/xoops/?rev=1916&view=rev
Author: phppp
Date: 2008-07-27 11:04:10 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Added release notes and checksum files
Added Paths:
-----------
XoopsCore/releases/2.0.18.2-rc/checksum.md5
XoopsCore/releases/2.0.18.2-rc/checksum.php
XoopsCore/releases/2.0.18.2-rc/release_notes.txt
Added: XoopsCore/releases/2.0.18.2-rc/checksum.md5
===================================================================
--- XoopsCore/releases/2.0.18.2-rc/checksum.md5 (rev 0)
+++ XoopsCore/releases/2.0.18.2-rc/checksum.md5 2008-07-27 11:04:10 UTC (rev 1916)
@@ -0,0 +1,623 @@
+admin.php:d0eaa0a6845ed3529a75f06b68076add
+backend.php:8e6af7cf77bf595d7b94c1406f6c944f
+banners.php:d15b4df77e76fbe58140b1912c851cc9
+edituser.php:f8b3c40ae4e4c9875e504e70879b8626
+favicon.ico:9187f6607b402df8bbc2aeb69a07bbca
+footer.php:8402b5ba80f306dfd32041c2858e4a79
+header.php:50021f36b1205e5edf06dc946c6a4db6
+image.php:d3a2c49c42bdb32db9137a853175c6d4
+imagemanager.php:0756119e27cbd1a27ef72e94db5d1725
+index.php:212385625755a2468af37cfbaa2a0c5f
+lostpass.php:ca4ad5b5ebb6e931525f56706d0ba0b4
+mainfile.dist.php:7b168e21688d45c8e96836eb3bb47c92
+misc.php:d123743f040d2bb9bdd9044beb24ff9e
+notifications.php:59350d4c6e2d7f15743afdff5bb214d1
+pda.php:3573d6e5dc7bd6e06089c830ca46ead2
+pmlite.php:3ddf69227611aa431aab276ea80d2985
+readpmsg.php:aacdc1858b94fc6fe28fb4d1eab42319
+register.php:39338ead08e9aa48720b7eb42f2f5afd
+robots.txt:117129dc086e5e2502be53521849aa1a
+search.php:0e307592f09964a5caf0d54375135c3d
+user.php:574d770de65ca3463ade6ddaba81481c
+userinfo.php:4ccce7bdb2d9a35299beccb1d80bd975
+viewpmsg.php:628a2c749ab3ec1f7da0025fa0624367
+xmlrpc.php:9dc127bdd4de8d61a8bcfe6b43dcd0b6
+xoops.css:399021c9441b107697555b56b34bc55d
+class/class.tar.php:7ddffcca50ca50e257a30b44b5fa0678
+class/class.zipfile.php:35f2ff6d4e176b92c26aedba894a3680
+class/commentrenderer.php:5c22f0d80dd44b6c2dea9f4574e5d3f8
+class/criteria.php:9bde00f89edcd737c15e470a40cfe5a9
+class/downloader.php:99619f7cd1b974100974a10d4fca6570
+class/errorhandler.php:3c74149eb62e31c13e62b4622fa2233c
+class/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/logger.php:57484810c425a9e594a45c9ae610376b
+class/logger_render.php:891892fc88ecb58efb20125d3792bd96
+class/mimetypes.inc.php:d3ac7662351eecb4a9d1c99925b0ab9c
+class/module.errorhandler.php:845f85259a07b10ff7b13ef3a3bc47f9
+class/module.textsanitizer.php:c621603691bbafaf387d6548fabca606
+class/pagenav.php:7d0292a762d57cec582624069274217b
+class/snoopy.php:296b4a510d7d56254600f08d802ab516
+class/tardownloader.php:3163294fb8cb28d9be68d6a61ad540b1
+class/template.php:f1fa492963fd06ca3963279aef786075
+class/theme.php:269eeb7865c91965bb4ed38c7cd00880
+class/theme_blocks.php:ff845240670abb8692690293965b6134
+class/tree.php:6595c30407ee3181688a3e31b0c14789
+class/uploader.php:2277c33d1d2822e2ec4d81a867e5453a
+class/xoopsblock.php:0b023c048ddbdf8ebc42897959ea28be
+class/xoopscomments.php:aeaa18f46cb1f2a3e923499191c03a7b
+class/xoopsformloader.php:f70ac5bfbe1a7796d57cd478dd718221
+class/xoopslists.php:e8f96a8d7b8a8234754a298c69530487
+class/xoopsmailer.php:b40d78c6ea11089e519cd1286d0507a9
+class/xoopsmodule.php:38b4faa27cb9e134947f2f3d695d0e19
+class/xoopsobject.php:06fecde1c0e15df2d05146d0b537d73e
+class/xoopssecurity.php:9d2875210dfd6456f7752463622ce3dc
+class/xoopsstory.php:9803771492cd672ef7edd52d8c809f06
+class/xoopstopic.php:ca115e7aaa5260d2a0ac20167913ce42
+class/xoopstree.php:35d98e5047c53b134d6fbbc35f43fd30
+class/xoopsuser.php:50a775bb453cc7ec2a5d99a6d38677d2
+class/zipdownloader.php:7f3f13ed7f0ed5d806ae7c3b478ac771
+class/auth/auth.php:4965d2f6773895eaeddcb15c0a52b45a
+class/auth/auth_ads.php:3c963139485468350ece0210b5d1fe1e
+class/auth/auth_ldap.php:d1a9a451ce9c0708af892c195d3f9e5e
+class/auth/auth_provisionning.php:2f7ffafd2243204cfa13c44f13011d2a
+class/auth/auth_xoops.php:c9921044b431fc53cc346d307686e2ab
+class/auth/authfactory.php:f4d38cbd6681704c5e43595610f3ef04
+class/auth/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/database/database.php:e95ea8e742b357ce7513e47e958d49ff
+class/database/databasefactory.php:5612c40b86c2556cce12be5cd1139af7
+class/database/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/database/mysqldatabase.php:671ad49a10f03de62f356b9d9a72cb71
+class/database/sqlutility.php:83f930ea4157cf8d55183ede4629f12c
+class/mail/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/mail/xoopsmultimailer.php:8347d99915a3bc582e0550d4438472b1
+class/mail/phpmailer/ChangeLog.txt:eb64471fb08256563d7d82d8939e4863
+class/mail/phpmailer/LICENSE:278f2557e3b277b94e9a8430f6a6d0a9
+class/mail/phpmailer/README:20d2b8e182743c998759bcd9b0306207
+class/mail/phpmailer/class.phpmailer.php:7d889d90bab0742c5e0aacf16bcfade7
+class/mail/phpmailer/class.smtp.php:4b458a4f4ac2e812b2a42ee039fd5876
+class/mail/phpmailer/language/phpmailer.lang-en.php:7ff797303960fb258da42a495d8c74a9
+class/smarty/Config_File.class.php:3a1aa274bc63872f0958a1652f7d5c87
+class/smarty/Smarty.class.php:cd440fb9d140381f01a7832bfbd6e00d
+class/smarty/Smarty_Compiler.class.php:cdf42931345f8969c2c11e7dc0a5c8d0
+class/smarty/debug.tpl:def6c6e062941c8b2986f9f977b26307
+class/smarty/configs/test.conf:2f99e2310b1dd4a254c594c49549d9d2
+class/smarty/internals/core.assemble_plugin_filepath.php:c98832bd718c94629c732b5d4c2980cb
+class/smarty/internals/core.assign_smarty_interface.php:4c2dd142c1c59e101b2f60cfc7a7cdc2
+class/smarty/internals/core.create_dir_structure.php:a12f6e4653dc814369202e0ed57206b0
+class/smarty/internals/core.display_debug_console.php:297b9baf349e7f32e8e815612e823e3c
+class/smarty/internals/core.get_include_path.php:ba78ea6d4112d4325b00e4b8101497c6
+class/smarty/internals/core.get_microtime.php:72eb40e8367f77f0bd251e15a5bd4f5f
+class/smarty/internals/core.get_php_resource.php:e0fccd538d6f0ed8915d39cc2f9dd860
+class/smarty/internals/core.is_secure.php:7ea83dd65e64bc0bc893d44096ec61e0
+class/smarty/internals/core.is_trusted.php:83e22de7a251fef6a033769b35989bf6
+class/smarty/internals/core.load_plugins.php:d60028c542ec06749cd2d381bc07d0c2
+class/smarty/internals/core.load_resource_plugin.php:08d531fb688eed7253b316b11436e512
+class/smarty/internals/core.process_cached_inserts.php:2a846ebfec89211b7090149052374059
+class/smarty/internals/core.process_compiled_include.php:6da8abe9ab2050618fd6e344fbc8059b
+class/smarty/internals/core.read_cache_file.php:e7de28f374768f8b319687a34e226c80
+class/smarty/internals/core.rm_auto.php:8834d9e9a8aa8473244d74096638b5c2
+class/smarty/internals/core.rmdir.php:08209df8f3113b0d8322bcac3b5e055b
+class/smarty/internals/core.run_insert_handler.php:f6452eb1f0f65cf3b07634228ea4c938
+class/smarty/internals/core.smarty_include_php.php:0d87e492eb18ec8b4fa492f2ac34c163
+class/smarty/internals/core.write_cache_file.php:6e0ca7e246ee7a6fea7e2e6e4381332b
+class/smarty/internals/core.write_compiled_include.php:ff7944e8092eaf7c2ee97d865df29788
+class/smarty/internals/core.write_compiled_resource.php:caa79e832d4587991606dd9a0988c852
+class/smarty/internals/core.write_file.php:23f99e19895028592cff61325b6ed0b1
+class/smarty/plugins/block.textformat.php:f4e1cc15997ff132066f5e4e09e92054
+class/smarty/plugins/compiler.assign.php:6c3aaef0d3723c9f5875c7cd3610c1e6
+class/smarty/plugins/function.assign_debug_info.php:0abdfebfea185a7b1a727d9546e244be
+class/smarty/plugins/function.config_load.php:fa6466c59cab6333c64ac270dd6c53b1
+class/smarty/plugins/function.counter.php:9531e844efd007c593dadd6173cb0bbd
+class/smarty/plugins/function.cycle.php:db7b2e51bd5e26f93032929dcb2d531b
+class/smarty/plugins/function.debug.php:4963d564da17a2578fc5f56d9c53e7bc
+class/smarty/plugins/function.eval.php:3fedd0e2a4c285200c12fe6427bc2739
+class/smarty/plugins/function.fetch.php:51259f99b6554fa1a6a60013a5e7880a
+class/smarty/plugins/function.html_checkboxes.php:a05460918e36fd9ef66d955754868a3e
+class/smarty/plugins/function.html_image.php:de11daabe07795fe4229b8d0185489dd
+class/smarty/plugins/function.html_options.php:b634076ab0424a5b8310ff733c5615a6
+class/smarty/plugins/function.html_radios.php:6a00315efe8f8202823ade3bf3e6e513
+class/smarty/plugins/function.html_select_date.php:ad1d200bf750d98379cfc5507eac681d
+class/smarty/plugins/function.html_select_time.php:ac7c160c72b293e6509840a5aba9a429
+class/smarty/plugins/function.html_table.php:d7ade8af24efeb33f852bef185004521
+class/smarty/plugins/function.mailto.php:03b5b66b3c6221c34b0d27c030dc7b60
+class/smarty/plugins/function.math.php:0b33b8526bcff403e3d650c3d7eb982b
+class/smarty/plugins/function.popup.php:1e8b78080d08a386ba297c0dbb7c3a7b
+class/smarty/plugins/function.popup_init.php:b2353a42807535109e1f037c0d51f19c
+class/smarty/plugins/modifier.capitalize.php:70f58c49c5bd2851be11a3d67a92d2a4
+class/smarty/plugins/modifier.cat.php:9dbc6c2d6d78165d9d0ffae481509b6a
+class/smarty/plugins/modifier.count_characters.php:91694b84f8b86aa551ff49ced16dbd11
+class/smarty/plugins/modifier.count_paragraphs.php:c64e0f47b6435424a7bf9647eed06c1e
+class/smarty/plugins/modifier.count_sentences.php:c22e43e96e6ecd34cc18bc5235d59337
+class/smarty/plugins/modifier.count_words.php:073467c9ea7434647bb9ff27fe09183b
+class/smarty/plugins/modifier.date_format.php:5d57183abba166f670d0b8649086f516
+class/smarty/plugins/modifier.debug_print_var.php:083998f71b350e0f2bea5b46477680c2
+class/smarty/plugins/modifier.default.php:11c16bd6f7dde6d576d7f93433652925
+class/smarty/plugins/modifier.escape.php:3bd0b2464f2fe8e2688da39079d84190
+class/smarty/plugins/modifier.indent.php:ea1f5db88c00e850c3968e434eadb074
+class/smarty/plugins/modifier.lower.php:5520933762ceac07d49e658c52587279
+class/smarty/plugins/modifier.nl2br.php:1d16b98e8ec34aac69f0827fab1dc999
+class/smarty/plugins/modifier.regex_replace.php:d4e8f465bc8adbd6119e788dfea53d66
+class/smarty/plugins/modifier.replace.php:b7d144b301a878c3015f9ba96b1922c6
+class/smarty/plugins/modifier.spacify.php:66993120ab60306acd278a327c5af448
+class/smarty/plugins/modifier.string_format.php:401048107fc62eecf175d2a0ab997161
+class/smarty/plugins/modifier.strip.php:b1281f77297db8c1e50bc1fd883ebd78
+class/smarty/plugins/modifier.strip_tags.php:481144a581e2d56a2182add2e09c5641
+class/smarty/plugins/modifier.truncate.php:da35c3d0a2dfc9ea11c32b3a10246aa7
+class/smarty/plugins/modifier.upper.php:0ef0e9784273f5d5384f34ad303bd15e
+class/smarty/plugins/modifier.wordwrap.php:b80bdf801ac29e3aa4662a0428b676e4
+class/smarty/plugins/outputfilter.trimwhitespace.php:6535eaea7108bacf0bd81d45983eced2
+class/smarty/plugins/shared.escape_special_chars.php:2f7221015323ba27d2ed5ae20450fa0d
+class/smarty/plugins/shared.make_timestamp.php:29ffe6553da8fda72147a12273105e10
+class/smarty/xoops_plugins/compiler.foreachq.php:a60d43c3a7eacbcaea56d6065d9528a8
+class/smarty/xoops_plugins/compiler.includeq.php:eb7f9d5d3ea79a99ca253e7a6d20d45c
+class/smarty/xoops_plugins/compiler.xoAppUrl.php:16e8ce79f7646046f7e95e837f6bfba1
+class/smarty/xoops_plugins/compiler.xoImgUrl.php:a3b6772385ef1738a703c8fb86c8e849
+class/smarty/xoops_plugins/function.xoInboxCount.php:f631b3aa1cfd35e9ee40db59abbe8db3
+class/smarty/xoops_plugins/function.xoops_link.php:73245b625581892220aa5742045761a8
+class/smarty/xoops_plugins/modifier.debug_print_var.php:bd886be994e60ff00ef36fa5174e6044
+class/smarty/xoops_plugins/resource.db.php:2eeaf70d08567e0b934ddf255703aaa0
+class/xml/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xml/saxparser.php:07880fe0681dd0ce640051b306989ba5
+class/xml/themesetparser.php:c1c53f60e35f9a2f5f43ddec72757b57
+class/xml/xmltaghandler.php:0838e3d3ecb9bd120a36b48bfab168b0
+class/xml/rpc/bloggerapi.php:461a27720a7230938a697237ee33182c
+class/xml/rpc/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xml/rpc/metaweblogapi.php:1cad7a5679a1c52ed7ec3ca284bfb778
+class/xml/rpc/movabletypeapi.php:16024fab4c3a14af1546d46fbee54dc0
+class/xml/rpc/xmlrpcapi.php:05404eee87673d77cf187e3696d1c349
+class/xml/rpc/xmlrpcparser.php:dcc7b5e47150b6e970184b10ed555f7a
+class/xml/rpc/xmlrpctag.php:ed45035c83609e427f28395c74a433cd
+class/xml/rpc/xoopsapi.php:3aa0929fa7dfb091a26b4b3697cc3eec
+class/xml/rss/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xml/rss/xmlrss2parser.php:31c9a32f22962d1b1caf979319ac460c
+class/xoopsform/form.php:6c492a6c6f0605499cb8fdde4986cdbc
+class/xoopsform/formbutton.php:ea1bbd7e6736fa367b2822418798fdd9
+class/xoopsform/formcheckbox.php:13340e55015a069bf1c6c3ec66c5d851
+class/xoopsform/formcolorpicker.php:dfe46360a22be6452cabea77f2206f18
+class/xoopsform/formdatetime.php:f977aa574ed5f74a0949f45cdbfa8902
+class/xoopsform/formdhtmltextarea.php:3b6771c5e57aad8d59f5abd14c055e0a
+class/xoopsform/formelement.php:94dd7f8dfc94aeb3285cade9496ddd40
+class/xoopsform/formelementtray.php:972f9ea1c8721ecc1a90e09525d3f660
+class/xoopsform/formfile.php:11d721d74aa531e6e9bf05487db59f19
+class/xoopsform/formhidden.php:a4736c43ff30ca044cdaf8897455ae24
+class/xoopsform/formhiddentoken.php:9c9455d62dd05058ce1b96acf284670a
+class/xoopsform/formlabel.php:2219e59977e3454c8f9d4867dcfcb08f
+class/xoopsform/formpassword.php:29dfffce16f3f5e8cdac6641cce6c0c1
+class/xoopsform/formradio.php:62a7c1a75fa0c92cea4c51a14ee284f5
+class/xoopsform/formradioyn.php:0959b26cf502b6ab5b566ed033ace6e5
+class/xoopsform/formselect.php:2f7d0c765577fd16b5dab8ed653a76ab
+class/xoopsform/formselectcountry.php:596ac223746138c76f11088b0d60ea63
+class/xoopsform/formselectgroup.php:8eea73c77d87dff4ac684690b0339389
+class/xoopsform/formselectlang.php:a26ce2511b08aae2e4ff4d74d9165c84
+class/xoopsform/formselectmatchoption.php:0864f68377cdde685fcb669dcd713d66
+class/xoopsform/formselecttheme.php:c450d96ce96c4407af77a439e815d28a
+class/xoopsform/formselecttimezone.php:09b8a1fd56ba27255a2e9fd7e935799b
+class/xoopsform/formselectuser.php:a4e1c51bb42fd714416278c800b52e17
+class/xoopsform/formtext.php:94ddd7285dd82ebeef5d66ce90bfb333
+class/xoopsform/formtextarea.php:d920ef27669d27581952ceeb94118276
+class/xoopsform/formtextdateselect.php:264237ede2be2b36bf49998f4029fe5c
+class/xoopsform/grouppermform.php:62b9c13829bc776952178c9f69dc334b
+class/xoopsform/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+class/xoopsform/simpleform.php:b43627ddc2eea7e1bfafcf3737de4b10
+class/xoopsform/tableform.php:74ba0f88bc1e76bef6de903d1ea0a028
+class/xoopsform/themeform.php:6cf3deecc337e2493c8c2d2fa502a4d8
+images/aligncenter.gif:bb4ebcca96cc5a1de79bb408c7e6c5cc
+images/alignleft.gif:ff0af550a83ac653585d44950ec70b3f
+images/alignright.gif:e04b2d584727efd58aab8d73714d72ac
+images/await.gif:1c0c3d8325ce4ec922f45af270fa9c9f
+images/blank.gif:49cdc214849d5ced018d230677b14076
+images/bold.gif:e31d50ee227a11bebad0548b0b249b11
+images/code.gif:a94e775403e103ee072bb0156c764a85
+images/download.gif:c04fdadc3ced3a2edd5500efef718dc0
+images/email.gif:fe89e3ab3eb6d727b8263a7c7f5607dc
+images/image.gif:c33a77dfcf9854badc3b03c9c1574e8b
+images/imgsrc.gif:2b38371f664340415c17f543de3a773e
+images/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+images/italic.gif:4fedc88a4abd21006d0f3a5cd420df33
+images/linethrough.gif:92c6ac927247cbb5f28a000063f07e25
+images/logo.gif:8160522197af080d9a1b371d33d332cc
+images/pagact.gif:f51e3a9657585db590aa7f5d635333a7
+images/paginact.gif:2f1e920d25355ded68276aaae7b475ab
+images/pagneutral.gif:f4a652f99c1bbee559558a0f3f538a7e
+images/password.gif:215da01f2231a51131f7e0d9bd66c3c2
+images/password.png:437a4b42c308e2a626ab2da253ab429a
+images/pointer.gif:273d7f89167b8ffcdd194201142ed75e
+images/poweredby.gif:7c366073172ada947f03dff837ea0909
+images/quote.gif:99237e4b3508bdbfd059ca5782449af0
+images/read.gif:f638ec47a2f4ace642b3bc60c7eb5ca1
+images/s_poweredby.gif:07076217a43b5d5391e6f28b5a600c3c
+images/underline.gif:35445fc50b0232fe79e6cfd5982681dd
+images/url.gif:dc3afa4189a2ec1adcbaab147226f2b4
+images/banners/banner.swf:c14f8f4cb12fbd921e5d4451f960f659
+images/banners/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+images/banners/xoops_banner.gif:a6a7a8863fe206fcc3ed23abcb01bdc2
+images/banners/xoops_banner_2.gif:5f5b7a0fc35cfca5ba54607e234c684e
+images/icons/aim.gif:cd81264af3dae7ffe10ba8b97f4dbf19
+images/icons/delete.gif:4b69b271642b7e12d0202edfb5702a27
+images/icons/edit.gif:9421aa9bf118de1162fbf86f90b0bd0f
+images/icons/em_small.gif:812836d50b730612f15ed67cdbe3dde5
+images/icons/email.gif:78816153b1581a7a4b90a173a2e50c35
+images/icons/icq_add.gif:209ce74c8857ab590fd4b49870ea2176
+images/icons/index.html:d41d8cd98f00b204e9800998ecf8427e
+images/icons/ip.gif:80241af0de467445080abed8be24ce0c
+images/icons/msnm.gif:9410df9969db77b1c56e617a41ce0da9
+images/icons/no_posticon.gif:001dd4512e84f78e7602a69d927f5565
+images/icons/pm.gif:7ccff3870289fbeedbc83b307ca88215
+images/icons/pm_small.gif:38555bc09d5d1e2ca157dfbac7eb5c31
+images/icons/posticon.gif:a4e80a8318242d93cbf7af8168fbb31a
+images/icons/posticon2.gif:1efe12b5bcc935d779786aed9bf278fd
+images/icons/profile.gif:fcb50419904054fe696945d46c917b6d
+images/icons/reply.gif:6164de9d119a57ba12b96a80defc032e
+images/icons/www.gif:7a94b0ddaae324f6d90bd36ce3a16fe9
+images/icons/yim.gif:513f79d78a6ba18f0ccdc780f232768d
+images/subject/icon1.gif:edbc96679c5cece12383d7cedbd9f90f
+images/subject/icon2.gif:4cb0a57117dbd60e2306f5bd1f25daf4
+images/subject/icon3.gif:67b58a0671cfe672bc505fa54ffe9d02
+images/subject/icon4.gif:a23c478f5f20024c673c2d0d1b09ec66
+images/subject/icon5.gif:d6d3c9f5487bfaec1906fd6b937e0190
+images/subject/icon6.gif:258a7c3f56d11b2173e0983c2b2c5afd
+images/subject/icon7.gif:b30a99bfcfc15e2234c1c7d57958978c
+images/subject/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+include/calendar-blue.css:7ed93f5fe431d769ff10eebab95005f2
+include/calendar.js:4407b50bfdca13aad2db48124e27969b
+include/calendarjs.php:9ea808e1130d6d0e2dc834e7e21ae6a6
+include/checklogin.php:7dd2454e83ee47a9b25e50ba2a12121a
+include/color-picker.html:d99044c7c8370cfc7a31074eb7f82d33
+include/color-picker.js:a591df12eee3b9266828d4873d64ea75
+include/comment_constants.php:e8ebfeb0b048d266026704a35c649d2e
+include/comment_delete.php:597ce6ffdcb2faa67d6688a46a3fb8a2
+include/comment_edit.php:eb4acff3c2b47f66bdf7c4931a7a4f49
+include/comment_form.php:521921098b73532d16ae8b930d228066
+include/comment_new.php:7e0acad8c8a0db5529a98b1eef495add
+include/comment_post.php:73846ebd68b8505de28a1e20b9a4c420
+include/comment_reply.php:2633b65ef371cfe6abe0dd1b21290e5a
+include/comment_view.php:56a963ea0d03ebc280f383860f04a4c6
+include/commentform.inc.php:1ab7af7b3b0445ed5b12aea73ff42a10
+include/common.php:586052459e90b9fe308fbcf49633c747
+include/cp_functions.php:07758cb38101ed932567560021a7e720
+include/cp_header.php:7e5eb3901afb53f2bd8e48bcebce0a24
+include/findusers.php:ddb2851bbe84549435bd0ddc1ceac85c
+include/functions.php:77d9e69bb6fe4c46421c6ff26205c991
+include/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+include/layersmenu.js:6c327774b6b4ed7c619b3f77cee01099
+include/notification_constants.php:f88b82a15659e8eb4c658805c5b60c29
+include/notification_functions.php:5765f5ccc4b6a45ccc3c6d42f179db60
+include/notification_select.php:3d389b30e1b10de1646edccb8c6c58ea
+include/notification_update.php:443dad3c6039ea8eeccbe9f9517623b2
+include/old_functions.php:6d8ceab5358e134bc8f2ae85ca933152
+include/old_theme_functions.php:0c1283a92780ae535604500f4f134e11
+include/registerform.php:52b2187bea65dc2c0bbf2134d08acdeb
+include/searchform.php:35fc760aaf27cf0f566b871660130c21
+include/site-closed.php:0812b7d8690e9fae8debb1822916f9da
+include/version.php:0529703cf59e12e2968228ce609fc4e4
+include/xoops.js:8cc7bdb4952e1420f3fae7afa0f70da8
+include/xoops13_header.php:fba1d6e9f44093e0fbdf9dc3576ac0e8
+include/xoopscodes.php:9de8ec57afb48feb88c185c240975ea8
+install/index.php:85a11b5ace7ace210e7c97145c9719b0
+install/install_tpl.php:d9c920dd9cb9eb3f23ad678cc14c2c8f
+install/makedata.php:4ffc79f1703e3aa09eaff32b99eab692
+install/passwd.php:d923b562f1b2867d794c3f2543e5c699
+install/style.css:01ab1ec2e99a951b7ea77de4239a9bb1
+install/class/cachemanager.php:1d1068144156193acd23f8b37b52c41c
+install/class/dbmanager.php:a061ddec3d0fdd870e2bfc8fb72933d9
+install/class/mainfilemanager.php:cb9dbaaddd1fc08daadf5cf9e508121d
+install/class/settingmanager.php:65e878f17ecee053efb305036b3fb8e2
+install/class/textsanitizer.php:f53edc38cf53f781720e5e286ad2bf60
+install/img/bg_content_left.gif:1fbd1ba1f70377d65662cd5229a5ea0d
+install/img/bg_content_right.gif:29c8b20e537a04e9840a11d0a6654caf
+install/img/bg_darkblue.gif:21a22dddfa6913a5cf4da526f1309283
+install/img/bg_table.gif:0c4677d4ee877cfd5e2804659e30053b
+install/img/dummy.gif:55fade2068e7503eae8d7ddf5eb6bd09
+install/img/hbar_installer_right.gif:d23d4e86f5679ac168b984c0d5cdcaf5
+install/img/hbar_left.gif:76ead8fb3ad7da89bfd86d8eb4400ae2
+install/img/hbar_middle.gif:6c1e7e05afe5d789b30cd5dc5931fc3d
+install/img/hbar_right.gif:a895f5c29d16a0a3702565447ae8c1f7
+install/img/logo.gif:8990ff6a44b4ef2b75622af9db402963
+install/img/no.gif:f4500bceb0f0482ea05d0dbbcad0ef35
+install/img/xoops2.gif:5e8024e9cd03478842dbd34b09f2b2ba
+install/img/yes.gif:f1f89f2e130785c96fdf23952f028d3e
+install/language/english/finish.php:adb0ac3cf806106849a0c91fb56e8bae
+install/language/english/install.php:130782cb1945c02e42f29b7475123bbc
+install/language/english/install2.php:23ce50ce01acd3c49c451bc83cdf75e1
+install/language/english/mysql.lang.data.sql:9e3d8780e29bad64f37ccd0ab782404f
+install/language/english/welcome.php:2729d15fa1a6dcd19ec8906037ee9a33
+install/sql/mysql.data.sql:474bfc467b1def26032dcfe1203b1d07
+install/sql/mysql.structure.sql:6ff64a42ca5f114125d1c992540ec412
+install/sql/upgrade/mysql.structure.sql:15b76048d49306f31c631036b748aaf4
+kernel/avatar.php:eb549e181e29bee4c827eb7536af2512
+kernel/block.php:ff6ac1c191575be2779bf4081c8d2ff8
+kernel/comment.php:b7fcd3dcda81d80b696e318f8ec54fe4
+kernel/config.php:27da6e42131cd864db00e64176dcb68f
+kernel/configcategory.php:4941eb0e1dce367e13dbf5906e35f753
+kernel/configitem.php:109b11976c27f68105e356c5ce6b4143
+kernel/configoption.php:a3c85dece0660f78ca8cc2936b87aea4
+kernel/group.php:4b652df453a6d91a60e9e0364abe88d1
+kernel/groupperm.php:1a76ee2ce787c92d92875d8c99f737f4
+kernel/handlerregistry.php:16311d220d32632dbcdf95c0acca4d25
+kernel/image.php:d9bb65b6ba7bddd1914b80c83ec77d20
+kernel/imagecategory.php:4f749d1e68346268b79db1a4b10573e4
+kernel/imageset.php:084a3d8ad518f32b96119c920171b4ca
+kernel/imagesetimg.php:79fcc7258b6f90c8fa58d5cf2be84d25
+kernel/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+kernel/member.php:86944fc582d2ca8d5476d7fca11bf713
+kernel/module.php:5fd2ffe820a2c1e973dc6baf888ee483
+kernel/notification.php:47a894d1b7e9cfeef31fc03638688fde
+kernel/object.php:ea7ba32aa408b7e1fd5dcdd566a89c98
+kernel/online.php:d239531d88115778e1f4d7640b8d2d6c
+kernel/privmessage.php:a48e9218d18fc3d22cf1d4facea716de
+kernel/session.php:6377e2ec6c81a9c2361fd7024fdfb8f1
+kernel/tplfile.php:49ef1dae5af1927410724b2a5cd34400
+kernel/tplset.php:a0dd1b934b6b78e67eb723ca79a058f6
+kernel/user.php:fe2822fac7404fb268330d267d2d1cd6
+language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+language/english/admin.php:2fb675922b334073dca21900c4dfbe45
+language/english/auth.php:23904fbe13d9bdb516581ba85d417cc6
+language/english/banners.php:e0dee24f30ccfa33a247d29c230218e7
+language/english/calendar.php:a6cfd3c8f69ca5dcaa71c652948ec769
+language/english/comment.php:78a292b94d7edd4a2ff3583813a025f5
+language/english/findusers.php:c5aa209713cc132875d6802bae0aed33
+language/english/global.php:213574ab5d65b3e9eaeaf78cb870c3c0
+language/english/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+language/english/mail.php:dc682e64fa38cd6eb89d34e2f6349697
+language/english/misc.php:267596bbaf027f9ef661e7b0b499ba8a
+language/english/notification.php:f267a2fc0dd62e395eafa080674d8c1a
+language/english/pmsg.php:20e3f72681e172c1dffafde4aaf0ef9c
+language/english/search.php:4aa943d36292ece02f70cb099561e5c8
+language/english/timezone.php:a80dc717145c25e10f4e8c40cec887bb
+language/english/uploader.php:37c0c07a838e1bac0880c3ace3a24cc8
+language/english/user.php:e2396fd34ec13719757746f004e42f21
+language/english/xoopsmailerlocal.php:dc76b79124d7a35c0c4d936cf5dc2de3
+language/english/mail_template/activated.tpl:46797b78f7657cdbac568bd81a2b689d
+language/english/mail_template/adminactivate.tpl:ec1780a81f1ad5b46880d35a62d32fed
+language/english/mail_template/comment_notify.tpl:5b8449c9d34eba7d38ca7aeedb2a9c5e
+language/english/mail_template/commentsubmit_notify.tpl:3f4ea62032595735d8aae17e3543956d
+language/english/mail_template/default_notify.tpl:7feeae7c49d49afd59c76a91eb4607d8
+language/english/mail_template/lostpass1.tpl:b534eab203f2b67d1998cee3d9235209
+language/english/mail_template/lostpass2.tpl:10ff980e536b527a4bf4a36082b30cf1
+language/english/mail_template/register.tpl:03e25fad3007793698a8b64e91bb2215
+language/english/mail_template/tellfriend.tpl:1cae062a85c2f1d21c889e9137545586
+modules/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin.php:cf984f78a9ba8b16d46cb0c4d641e7b1
+modules/system/constants.php:0bccedeb4df540ba1f756a62e8edbe2c
+modules/system/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/menu.php:16a9d4e907194d253a998551901cf0ff
+modules/system/style.css:1c321be9b51efd27894a1bc8db258a3d
+modules/system/xoops_version.php:f3669e0fd4442bc6ad03b54aa8e6e3bd
+modules/system/admin/groupperm.php:e7939a080fa87575e3143f41acc168c5
+modules/system/admin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/avatars/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/avatars/main.php:f687d14186debe14533bfa31d94c48cf
+modules/system/admin/avatars/xoops_version.php:b66cb0acdda08c10cdc4ce6806dd9ec1
+modules/system/admin/banners/banners.php:a8d85bb05b3230b840cbc387ce7d5504
+modules/system/admin/banners/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/banners/main.php:51b12f78f8bc27c9124e3e3ab2898ee7
+modules/system/admin/banners/xoops_version.php:eb2d666b4766c938a537d9e0a03cea6d
+modules/system/admin/blocksadmin/blockform.php:45a38970b57dfa08be35ec1cedb6bfcc
+modules/system/admin/blocksadmin/blocksadmin.php:123a708fd63c5d22931bfa17491cd1d1
+modules/system/admin/blocksadmin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/blocksadmin/main.php:8e98af7f792f65572b6ac00bb9ce1c1d
+modules/system/admin/blocksadmin/xoops_version.php:d5596d9e8e207ecba2dcd1ccd259358f
+modules/system/admin/comments/admin_header.php:c2603a9a6bfc0218a9086bf229300d90
+modules/system/admin/comments/comment_delete.php:69f356b05ae46679dbadc431564be472
+modules/system/admin/comments/comment_edit.php:0915239e30bb4eb68a11b5028a25f981
+modules/system/admin/comments/comment_post.php:93065c264e59869d9cbe9bd25d152f2c
+modules/system/admin/comments/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/comments/main.php:33833258bbe8d6ddb92ee2eb40ede62b
+modules/system/admin/comments/xoops_version.php:739c7c1f4d699e0843b958ff369a1298
+modules/system/admin/findusers/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/findusers/main.php:efd4d202af897bf8828d4490a831cc03
+modules/system/admin/findusers/xoops_version.php:8684706f49ae1e34f95801757dc0dc10
+modules/system/admin/groups/groupform.php:bb86ade234ccc99abf18b77fb8e0975f
+modules/system/admin/groups/groups.php:0d4d750902f35e19fc5c765984a12eec
+modules/system/admin/groups/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/groups/main.php:9cfb41b66650880c59bcd9bae7abe422
+modules/system/admin/groups/xoops_version.php:427f1bb3d263e5c423add1660f88efa0
+modules/system/admin/images/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/images/main.php:34f9da90153f0abc1a86fc11f11dab80
+modules/system/admin/images/xoops_version.php:2f42aab480a523d7fc25f0477fa8f43b
+modules/system/admin/mailusers/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/mailusers/mailform.php:cb21a21b504db92d160fcff0d331f583
+modules/system/admin/mailusers/mailusers.php:0bb04bc32f9871ceb3354756f72da2f8
+modules/system/admin/mailusers/main.php:4dab556cdb7f0e7ebd0d5b2b71014338
+modules/system/admin/mailusers/xoops_version.php:79af4e4212a829198d436510ed9bd302
+modules/system/admin/modulesadmin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/modulesadmin/main.php:33444d8065537db3a3499e1aebb0596b
+modules/system/admin/modulesadmin/modulesadmin.php:52b8c80b5a962e812a7acfdddd0b8133
+modules/system/admin/modulesadmin/xoops_version.php:c4bb6acd39d36a783f324087677409d8
+modules/system/admin/preferences/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/preferences/main.php:6dced51073589c71c4a83a0d10381206
+modules/system/admin/preferences/xoops_version.php:17f569a1ab3fc4fcc469b177df62be9d
+modules/system/admin/smilies/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/smilies/main.php:bc1e7bbb115d3978d30106753e364baa
+modules/system/admin/smilies/smileform.php:b5958d7916aea117a7943c1c038a6bc7
+modules/system/admin/smilies/smilies.php:36dd8c578459e47260a1a347a6fa9fcc
+modules/system/admin/smilies/xoops_version.php:6804bd945f642f0142eb9bc482ae289d
+modules/system/admin/tplsets/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/tplsets/main.php:646213a5fef7aee9ba25bed50a4eedb7
+modules/system/admin/tplsets/themeimgform.php:d78dfc6049330940d3c5972876cc5ab7
+modules/system/admin/tplsets/tplform.php:fa46ee8869f0dbd2c62c8075e048d090
+modules/system/admin/tplsets/xoops_version.php:56d731885b5b168e4554d7d9f170fab0
+modules/system/admin/userrank/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/userrank/main.php:6c2fea591439a341e70bf9cfd04fadb8
+modules/system/admin/userrank/rankform.php:72e3a0caa0e06daeeb686a1a02669aff
+modules/system/admin/userrank/userrank.php:8e68932a9d0285a68b6a6938ef5dd90a
+modules/system/admin/userrank/xoops_version.php:450849a107ef4e5c893a3b54d6685b23
+modules/system/admin/users/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/users/main.php:81fbc4aa3c546466bc6f5852db4c4808
+modules/system/admin/users/userform.php:ff7d2e2cd571dc3ecd33f40ec075f7a5
+modules/system/admin/users/users.php:3d017d2c4cd94f4f272ccc00e8821b99
+modules/system/admin/users/xoops_version.php:c88d4d9768d7c34b9551e25d8e5f4468
+modules/system/admin/version/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/admin/version/main.php:3a6eb7781bef2bed3f0b5abf5f82d88e
+modules/system/admin/version/s_poweredby.gif:a0f5d8c3fe55e7a1f75febc41c4cfe36
+modules/system/admin/version/xoops_version.php:ee14a9c5cd29351c12154faf073f92f4
+modules/system/blocks/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/blocks/system_blocks.php:cb9af6e7b4a77a06a708fa0a96867099
+modules/system/images/bg_content.gif:a97c90b4ce1ab15d10dcf8f8927b6c1f
+modules/system/images/bg_menu.gif:2fd50fce6348582c5d601c1b25c2a666
+modules/system/images/check.gif:9205e050618556e4e047ebdc46eab920
+modules/system/images/hbar_left.gif:6583933a751a8523bcaa067abb4d2dfc
+modules/system/images/hbar_middle.gif:6c1e7e05afe5d789b30cd5dc5931fc3d
+modules/system/images/hbar_right.gif:8079f8c7977c299b1cdcbf86837214b9
+modules/system/images/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/images/info.gif:afa24809dcf1ea8a4ff64497817ec228
+modules/system/images/install.gif:b41b04de51ace26e5072af2ccf8dc044
+modules/system/images/logo.gif:68b0f7df1758ceab6cda45ae9ab061bb
+modules/system/images/menu.gif:0c7001cb38521a47fdc12472f0347b50
+modules/system/images/powered_by_xoops.gif:10664840713f8cf395132c7393e23771
+modules/system/images/system_slogo.png:5a3d96a11b621135b4a7585ad3d5da8e
+modules/system/images/uninstall.gif:06931e931ad0d72c42689941cef55168
+modules/system/images/update.gif:89bf3db55057fc277cca8df0584fb884
+modules/system/images/xoops2.gif:5e8024e9cd03478842dbd34b09f2b2ba
+modules/system/include/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/include/update.php:2f1d935ac08cd68aef8fb734173e25ee
+modules/system/language/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/language/english/admin.php:bafd45cb7db8e79a8eb3fe884f445c50
+modules/system/language/english/blocks.php:223de6dde6bc5985a50fc6a1ac9d80b6
+modules/system/language/english/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/language/english/modinfo.php:d0b59fe98f3d8a7722fdaf8d58ac77e1
+modules/system/language/english/admin/avatars.php:5896e339596b26b564d724aac168a6b2
+modules/system/language/english/admin/banners.php:ed30f1a6cf18a995482d8ca7a6716279
+modules/system/language/english/admin/blocksadmin.php:b28c592a719c2bdac68519647c596a8c
+modules/system/language/english/admin/comments.php:565a2f21919761290e53d2cadb0d5cbf
+modules/system/language/english/admin/findusers.php:a0cfdc12c3ce79f514bdb47039fff0d4
+modules/system/language/english/admin/groups.php:8a812a43ee3570942f97963ef88b5295
+modules/system/language/english/admin/images.php:e6424e51bc4763a965e15e925af08b33
+modules/system/language/english/admin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/language/english/admin/mailusers.php:242c16d3b1f039315e01600ee6fa6122
+modules/system/language/english/admin/modulesadmin.php:42b3f660859e7a382609d8ffdb6c7eb9
+modules/system/language/english/admin/preferences.php:1446e621f61188ce5fcb7d2f6c2ded72
+modules/system/language/english/admin/smilies.php:74e06c85c7b5a6cc1b38586b84ebd5da
+modules/system/language/english/admin/tplsets.php:0a0ff20bc95fbafde0aef905a55fa66a
+modules/system/language/english/admin/userrank.php:2c01caca165124bb7a4b82896b6be635
+modules/system/language/english/admin/users.php:82579afd944950f1675a033865e3c747
+modules/system/language/english/admin/version.php:79075615abe0de9de77e09a76db87915
+modules/system/templates/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/templates/system_block_dummy.html:2f0dd2b3b057f92c4373431344b78a8f
+modules/system/templates/system_comment.html:55729df1bbea6ece1f89cd4d52daf887
+modules/system/templates/system_comments_flat.html:8082f1a327b37cfc9192f2bc4e517143
+modules/system/templates/system_comments_nest.html:df7c391baa2d2eb5f8c79640407096c6
+modules/system/templates/system_comments_thread.html:ab33114289b7ccfe99f6b6fa7082e01c
+modules/system/templates/system_dummy.html:8579612e81de7e772e4c70ff02ee06ad
+modules/system/templates/system_imagemanager.html:b99ab7f39bd931947658f10c3fa309a8
+modules/system/templates/system_imagemanager2.html:3821556eadbd048cafd09d92f739e586
+modules/system/templates/system_notification_list.html:4119c5ea52529b217212dba41ea7c413
+modules/system/templates/system_notification_select.html:eb5081837fd97637d2bdd4708faf3473
+modules/system/templates/system_redirect.html:49005fffa076c7b613ab75fe1d16fbc5
+modules/system/templates/system_rss.html:78f564e0246ac96b97654c8a28fc9b28
+modules/system/templates/system_siteclosed.html:67fa90d0809557268cdc39ba892875ee
+modules/system/templates/system_userform.html:6b0409a489ff070d100f245658274c71
+modules/system/templates/system_userinfo.html:4a16ee0210e6121661b86a39040b91d2
+modules/system/templates/blocks/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+modules/system/templates/blocks/system_block_comments.html:20518f74f2fe3f5f00206e5b808e1ae2
+modules/system/templates/blocks/system_block_login.html:d1da64efe9bfe81e3993d262b98a7045
+modules/system/templates/blocks/system_block_mainmenu.html:ec5dbea67758323518144690e65dfd7c
+modules/system/templates/blocks/system_block_newusers.html:c4d518edffb6b3d9337a2bd5df09aff5
+modules/system/templates/blocks/system_block_notification.html:1f91e94ab34d9844380f87973c688721
+modules/system/templates/blocks/system_block_online.html:2101de303fd29e7e3ddc4f9d2ee90985
+modules/system/templates/blocks/system_block_search.html:5a9c9ad1c706551907beaf113e94738e
+modules/system/templates/blocks/system_block_siteinfo.html:5222881c4a9a5c7ec15b7d0f415a4b68
+modules/system/templates/blocks/system_block_themes.html:cf09f1ee160403702f50b78d85e9d779
+modules/system/templates/blocks/system_block_topusers.html:c8af85c7367820798727f1f3206f9a20
+modules/system/templates/blocks/system_block_user.html:725872bef06d2f7cd4286ef527de326e
+modules/system/templates/blocks/system_block_waiting.html:90c19fdef5106cee9207b3bca9ece7bd
+themes/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/default/hbar.gif:ea1305a8064d975f413725b07c9b288d
+themes/default/logo.gif:8160522197af080d9a1b371d33d332cc
+themes/default/poweredby.gif:10664840713f8cf395132c7393e23771
+themes/default/style.css:befbbde8890781555d5df6dc0fe32b03
+themes/default/styleMAC.css:46a9cfe1d4203e64dabafa63661df0ea
+themes/default/styleNN.css:d243a11efd6768e653b3d619b4b2f89c
+themes/default/theme.html:e1fba58332dedafaf40266c911c8256a
+themes/default/theme_blockcenter_c.html:1e946aa6661ae69de258e5739d97a5c1
+themes/default/theme_blockcenter_l.html:9d780bf18020563b7eb6371bdfe78610
+themes/default/theme_blockcenter_r.html:b8bb32b403f62171b1764a1e60e29646
+themes/default/theme_blockleft.html:9d7a705b1998ceeafff739061668a837
+themes/default/theme_blockright.html:9d7a705b1998ceeafff739061668a837
+themes/zetagenesis/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/zetagenesis/screenshot.gif:a54185b2a6088401b58346fbe6aba22f
+themes/zetagenesis/theme.html:6722f1914e4914c97520a2f94e1b01be
+themes/zetagenesis/css/blocks.css:def79056fe5b2167c3645f50f021e24b
+themes/zetagenesis/css/content.css:c0913b89cf6d00dc79744413b1f10632
+themes/zetagenesis/css/forms.css:653d263ee30dfb9b1ffac7cb6a8fc5f1
+themes/zetagenesis/css/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/zetagenesis/css/layout-soup.css:02f97b9475a1b13f6a8b61e127dfa773
+themes/zetagenesis/css/style.css:14fbca90323a4ed4a34533f135d840cb
+themes/zetagenesis/css/xosystpl.css:655301583edf46b25f67c759012f6089
+themes/zetagenesis/icons/favicon.ico:9187f6607b402df8bbc2aeb69a07bbca
+themes/zetagenesis/icons/icon.png:7865b5291ae4b2cd9991678a33aaa5d9
+themes/zetagenesis/icons/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/icons/action/friend.png:7f91d086cec59ec6a5c860efc87f7fda
+themes/zetagenesis/icons/action/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/icons/action/pdf.png:b76b24eb68a0f8e68aae636052d5a066
+themes/zetagenesis/icons/action/printable.png:6694a37dde93c3cd97c645bbcc8fb576
+themes/zetagenesis/icons/users/configuration.png:6b93650f109a049ffefa212d68e8d945
+themes/zetagenesis/icons/users/exit.png:f8f910d70b0fa37d920edd2e6fe14677
+themes/zetagenesis/icons/users/home.png:cb8ae929af5aea12f76ca7db1b230278
+themes/zetagenesis/icons/users/inbox-full.png:8ef7ea278b29298565dbf4d47ed63f63
+themes/zetagenesis/icons/users/inbox.png:cca778aa387e7f21c60501db68178c80
+themes/zetagenesis/icons/users/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/icons/users/profile.png:581ee1c52a05a9b9ad84b2d2ac88b988
+themes/zetagenesis/img/bg-ad-top.png:486714192a73656b8faeb0eb9d8cf46d
+themes/zetagenesis/img/bg-left_block.png:0d5bda4dfb311d651dab456b545ea462
+themes/zetagenesis/img/bg-left_blockcontent.gif:bbbe9e946f499507236693df0c6a475e
+themes/zetagenesis/img/bg-left_blocktitle.png:db3ffdbee79b86b24aa3cfb5e9c33bcd
+themes/zetagenesis/img/blank.gif:56398e76be6355ad5999b262208a17c9
+themes/zetagenesis/img/button-hover_bg.png:3e1f1d06b8ac51458c3290714d623269
+themes/zetagenesis/img/button_bg.png:91144890fe732afc173d47cae1cfcc90
+themes/zetagenesis/img/centerblock-bl.png:a6856504267ddd82142fd484b03bf6f7
+themes/zetagenesis/img/centerblock-br.png:077368e55cb28eb67b02d38c494c9ca5
+themes/zetagenesis/img/centerblock-inner.png:f4c3c2c2c44fc49484bc4734e7a66f7a
+themes/zetagenesis/img/centerblock-inner_old.png:a29b810735610f4541e0e34a6086ab26
+themes/zetagenesis/img/centerblock-tl.png:985d046436561af3beadbc6ae6e80cca
+themes/zetagenesis/img/centerblock-tr.png:4ff8546dc145471700970f1e1a5911cf
+themes/zetagenesis/img/form-button.png:be5193e11b92b912d1ad507141ab62ca
+themes/zetagenesis/img/form-input.png:1424c859540d25a573186837ab1a2c71
+themes/zetagenesis/img/header-bg-small.png:760807c72701b6715ea9920e14a5446e
+themes/zetagenesis/img/header-bg.png:e643f61bd05f90838c2cfc3418131f96
+themes/zetagenesis/img/header-bg_big.png:e2e731e26f2552b729eb1a613799682c
+themes/zetagenesis/img/header-bg_small.png:ce93ce5d607ec7e3804a097d388c65c2
+themes/zetagenesis/img/header-logo.png:a4947e6b5a85ebd455e6c57df3efcfa6
+themes/zetagenesis/img/header-logo_big.png:f747717447f559415fb0c878373492b2
+themes/zetagenesis/img/index.html:d4d788249d08e2e8b07210aa65cb614d
+themes/zetagenesis/img/input_bg.png:de3ec846411784c8c921cdb22e7e841d
+themes/zetagenesis/img/navbar-bg.png:61ee95b106db573ba2140f71152e5481
+themes/zetagenesis/img/table-caption3.png:cb88726ef3771835334702e3c15ce9ad
+themes/zetagenesis/img/table-caption_grey.png:8610d845de656a92360ef29785f509bb
+themes/zetagenesis/xotpl/blockszone.html:1a617e37a439fc98d9cbccb7d85c8737
+themes/zetagenesis/xotpl/centerblocks.html:d9971ded9fcf53384be05006f36ca800
+themes/zetagenesis/xotpl/globalnav.html:b52291573a2f15ddb33cac307f320aba
+themes/zetagenesis/xotpl/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
+themes/zetagenesis/xotpl/userbar.html:2d3a3a5775d3fe1fe8c693224342cc6b
+themes/zetagenesis/xotpl/xobanner.html:e6c5bc9c767560875346e4d66267c92b
+themes/zetagenesis/xotpl/xobanner_commercial.html:98ecbf8bb6c4b2fa52e1975109044f9b
+themes/zetagenesis/xotpl/xofooter.html:0e33c118640f82a8316dd29d287d48af
+themes/zetagenesis/xotpl/xometas.html:a1dc58093e00d1d577040fdc8c49ee64
+themes/zetagenesis/xotpl/xoscripts.html:13c22c31cf33be0132eae18947a37810
+uploads/blank.gif:84231d04ae6cacc6ed16c33dafd41060
+uploads/index.html:d4d788249d08e2e8b07210aa65cb614d
+uploads/rank3dbf8e94a6f72.gif:6c1a6c0edb7d1249d35b5bdf251edd56
+uploads/rank3dbf8e9e7d88d.gif:7b0be5af1fe7e67a5d49ccc478c67892
+uploads/rank3dbf8ea81e642.gif:aaf1c573f2342db58fb2c93a95ec301b
+uploads/rank3dbf8eb1a72e7.gif:ebe9ad801693044e173bfee4c9f857a6
+uploads/rank3dbf8edf15093.gif:556c283a3bb6e9436ee5608806dd8300
+uploads/rank3dbf8ee8681cd.gif:93bc3e2d9742830f21e2d2669a02e1d4
+uploads/rank3e632f95e81ca.gif:7dcfd082df9101d5d17259cd2019b9e2
+uploads/smil3dbd4bf386b36.gif:c67d0a9a30d389803083173d3b48af3f
+uploads/smil3dbd4d4e4c4f2.gif:eb02be2be01d18e9aefa2fc24e56fe2e
+uploads/smil3dbd4d6422f04.gif:6fffafd259b3f9afea2b9a01fcab6a5d
+uploads/smil3dbd4d75edb5e.gif:f5d15499d72340a16a633ae3bdb904e3
+uploads/smil3dbd4d8676346.gif:cf510276304ac481a309a9264cd12c88
+uploads/smil3dbd4d99c6eaa.gif:71032099437bcb91c7db2454a945968e
+uploads/smil3dbd4daabd491.gif:542513dc092433785adc39551797a5e0
+uploads/smil3dbd4dbc14f3f.gif:96ab8db2c7f53dae6f16f9f57a6774f6
+uploads/smil3dbd4dcd7b9f4.gif:b86966d5388cafa840df97d612160a52
+uploads/smil3dbd4ddd6835f.gif:d759013e6300998e1d50809fefe74f63
+uploads/smil3dbd4df1944ee.gif:cc106a7720659a43101e88f1396164ff
+uploads/smil3dbd4e02c5440.gif:8a0d4a3156dd0b62d9938353b8ab6b3c
+uploads/smil3dbd4e1748cc9.gif:6ee742e5394c492d63e788e0324bb356
+uploads/smil3dbd4e29bbcc7.gif:7cc2d45f8519febdcd7b16b1c86b06ce
+uploads/smil3dbd4e398ff7b.gif:80b46fcece3e365f802bb7888d2c627b
+uploads/smil3dbd4e4c2e742.gif:66a836ab9f55bd0d2d26a7be4a61ee71
+uploads/smil3dbd4e5e7563a.gif:6a91c1f7ee2b22e76b1307a749dc384e
+uploads/smil3dbd4e7853679.gif:be512685750f001d13e3c5f50e036132
Added: XoopsCore/releases/2.0.18.2-rc/checksum.php
===================================================================
--- XoopsCore/releases/2.0.18.2-rc/checksum.php (rev 0)
+++ XoopsCore/releases/2.0.18.2-rc/checksum.php 2008-07-27 11:04:10 UTC (rev 1916)
@@ -0,0 +1,70 @@
+<?php
+/**
+* XOOPS installation md5 checksumminig script
+*
+* This script allows you to check that the XOOPS system files have been correctly uploaded.
+* It reads all the XOOPS files and reports missing or invalid ones.
+*
+* Instructions:
+* - Upload this script and xoops.md5 to your XOOPS documents root
+* - Access it using a browser
+* - Re-upload missing/invalid files
+*
+* @copyright The XOOPS Project http://xoops.sf.net/
+* @license http://www.fsf.org/copyleft/gpl.html GNU public license
+* @author Skalpa Keo <sk...@xo...>
+* @author phppp <ph...@us...>
+* @since 2.0.14
+* @version $Id $
+* @package xoops
+*/
+
+error_reporting( 0 );
+
+header( "Content-type: text/plain" );
+
+$md5_file = "./checksum.md5";
+$root = ( is_dir("./htdocs") ? "./htdocs" : "." );
+if ( isset($_GET["root"]) && false === strpos($_GET["root"], "..") ) {
+ $root .= "/" . $_GET["root"];
+ $md5_file = "./checksum.".str_replace("/", "-", $_GET["root"]).".md5";
+}
+$num_files = check_folder($root);
+
+echo "There are {$num_files} files checked.\n";
+echo "Please remove the file $md5_file and ".basename(__FILE__)." as soon as possible.\n";
+
+function check_file ($line, $path = ".")
+{
+ list( $file, $sum ) = explode( ":", $line, 2 );
+ if ( substr( $file, 0, 7 ) == 'htdocs/' ) {
+ $file = substr( $file, 7 );
+ } else {
+ $file = $path."/".$file;
+ }
+ if ( !file_exists( $file ) ) {
+ echo "$file missing !\n";
+ } else {
+ $txt = file_get_contents( "$file" );
+ $txt = str_replace( array( "\r\n", "\r" ), "\n", $txt );
+ if ( md5($txt) != $sum ) {
+ echo "$file content invalid\n";
+ }
+ }
+}
+
+function check_folder( $path = '.', $recursive = false ) {
+ global $md5_file;
+ $num_files = 0;
+ if ( !is_file( $md5_file ) || !is_readable( $md5_file ) ) {
+ echo "$md5_file file not found.\n";
+ return false;
+ }
+ $sums = explode( "\n", rtrim( file_get_contents( $md5_file ) ) );
+ foreach ( $sums as $line ) {
+ check_file ($line, $path);
+ $num_files ++;
+ }
+
+ return $num_files;
+}
Added: XoopsCore/releases/2.0.18.2-rc/release_notes.txt
===================================================================
--- XoopsCore/releases/2.0.18.2-rc/release_notes.txt (rev 0)
+++ XoopsCore/releases/2.0.18.2-rc/release_notes.txt 2008-07-27 11:04:10 UTC (rev 1916)
@@ -0,0 +1,94 @@
+
+XOOPS 2.0.18.2 RC release notes
+------------------------------------------------------------------------------
+
+The XOOPS development team is pleased to announce the release of XOOPS 2.0.18.2 RC.
+
+In this release permission check ini imagemanager was fixed by dugris. A bug was fixed for custom session with regenerateId enabled.
+Meanwhile to prevent further confusing information about 'fct' parameter in admin.php that might concern XOOPS users, the parameter is now filtered.
+
+Read the full changelog for details.
+
+
+System requirements
+-----------------------------------
+
+PHP
+ Any PHP version >= 4.3 (PHP 4.2.x may work but is not officially supported)
+MySQL
+ MySQL server 3.23+
+Web server
+ Any server supporting the required PHP version (Apache highly recommended)
+
+
+Downloading XOOPS
+-----------------------------------
+
+Your can get this release package from the sourceforge.net file repository.
+Both .zip and .gz archives are provided.
+
+
+Installing XOOPS
+-----------------------------------
+
+ 1. Copy the content of the htdocs/ folder where it can be accessed by your server
+ 2. Ensure mainfile.php, cache, templates_c and uploads are writable by the webserver
+ 3. Access the folder where you installed the htdocs/ files using your web browser to launch the installation wizard
+
+
+Upgrading from a previous version
+-----------------------------------
+
+Upgrading from XOOPS 2.0.18.1 (easy way)
+ 1. Get the update package from the sourceforge file repository
+ 2. Overwrite your existing files with the new ones
+
+Upgrading from XOOPS 2.0.14/2.0.15/2.0.16/2.0.17/2.0.18.* (using the full package)
+ 1. Move the "upgrade" folder inside the "htdocs" folder (it's been kept out as it's not needed for full installs)
+ 2. Delete htdocs/mainfile.php, htdocs/install/, htdocs/cache/, htdocs/extras/, htdocs/template_c/, htdocs/themes/ and htdocs/uploads/
+ 3. Upload the content of the htdocs folder over your existing files
+ 4. Access <your.site.url>/upgrade/ with a browser, and follow the instructions
+ 5. Follow the instructions to update your database
+ 6. Delete the upgrade folder
+
+Upgrading from any XOOPS ranging from 2.0.7 to 2.0.13.2 (using the full package):
+ 1. Move the "upgrade" folder inside the "htdocs" folder (it's been kept out as it's not needed for full installs)
+ 2. Delete htdocs/mainfile.php, htdocs/install/, htdocs/cache/, htdocs/template_c/, htdocs/themes/ and htdocs/uploads/
+ 3. Upload the content of the htdocs folder over your existing files
+ 4. Delete the following folders and files from your server (they belong to an old version):
+ * class/smarty/core
+ * class/smarty/plugins/resource.db.php
+ 5. Empty the templates_c folder (except index.html)
+ 6. Ensure the server can write to mainfile.php
+ 7. Access <your.site.url>/upgrade/ with a browser, and follow the instructions
+ 8. Write-protect mainfile.php again
+ 9. Delete the upgrade folder
+ 10. Update the "system" module from the modules administration interface
+
+
+Files integrity check
+-----------------------------------
+
+The full XOOPS package is released with a script able to check if all the system files were correctly uploaded to the server. To use it, follow these instructions:
+
+ 1. Upload the checksum.php and checksum.md5 files located in the XOOPS package root to your XOOPS server folder (putting them next to mainfile.php).
+ 2. Execute checksum.php with your browser
+ 3. If necessary, re-upload the missing or corrupted system files
+ 4. Remove checksum.php and checksum.md5 from your server
+
+
+Incompatibility with some modules
+---------------------------------
+
+Beginning with XOOPS 2.0.14, a change in the core template methods resulted in some incompatibilities with some modules that do not have their templates under (dirname)/templates/ as many XOOPS modules do. Please read extras/readme.txt for workaround instructions.
+
+
+Modules
+-----------------------------------
+
+The packages do not contain any module apart from the system one. You are invited to browse the XOOPS modules repository to get some. Note: as a new repository is being built, the current repository is not up-to-date, PLEASE VISIT DEVELOPERS' WEBSITES TO MAKE SURE YOU ARE USING PROPER VERSION OF MODULES.
+
+We also highly recommend the installation of the Protector module which will bring additional protection and logging capabilities to your site.
+
+
+XOOPS Development Group
\ 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: wang <nuo...@si...> - 2008-07-27 09:26:22
|
能上网就月赚1000元 条件： 1、 自己有网站。 2、 自己想赚钱（没有网站也成）。 3、 有充足的上网时间或挂机时间。 4、 如果能换IP更好。 5、 会数钱！！！ 操作办法： 1、注册挂机帐号: http://www.sitehelp.cn/register.php?invcode=1750 注册地址 2、 加群。61367603 验证消息：互刷。 3、群共享里下载软件，然后按操作方法挂机。 4、不明白的问题问群主或客服。 5、开始数钱！！ 6、不诚意者，不要来！！有病毒者不来！！ 待遇是： 1. 月赚1000元。 2. 网站流量自然提升。 3. PR值每月一换。 |
|
From: <ph...@us...> - 2008-07-27 09:13:26
|
Revision: 1915
http://xoops.svn.sourceforge.net/xoops/?rev=1915&view=rev
Author: phppp
Date: 2008-07-27 09:13:35 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Updated the version number
Modified Paths:
--------------
XoopsCore/releases/2.3.0-rc/htdocs/include/version.php
Modified: XoopsCore/releases/2.3.0-rc/htdocs/include/version.php
===================================================================
--- XoopsCore/releases/2.3.0-rc/htdocs/include/version.php 2008-07-27 07:51:41 UTC (rev 1914)
+++ XoopsCore/releases/2.3.0-rc/htdocs/include/version.php 2008-07-27 09:13:35 UTC (rev 1915)
@@ -1,4 +1,4 @@
<?php
// $Id$
-define("XOOPS_VERSION", "XOOPS 2.3.0");
+define("XOOPS_VERSION", "XOOPS 2.3.0 RC");
?>
\ 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: <ph...@us...> - 2008-07-27 07:51:32
|
Revision: 1914
http://xoops.svn.sourceforge.net/xoops/?rev=1914&view=rev
Author: phppp
Date: 2008-07-27 07:51:41 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Created 2.3.0 RC release branch
Added Paths:
-----------
XoopsCore/releases/2.3.0-rc/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 07:47:20
|
Revision: 1913
http://xoops.svn.sourceforge.net/xoops/?rev=1913&view=rev
Author: phppp
Date: 2008-07-27 07:47:24 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Updated version number
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18.2/htdocs/include/version.php
Modified: XoopsCore/branches/2.0.x/2.0.18.2/htdocs/include/version.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/htdocs/include/version.php 2008-07-27 07:45:52 UTC (rev 1912)
+++ XoopsCore/branches/2.0.x/2.0.18.2/htdocs/include/version.php 2008-07-27 07:47:24 UTC (rev 1913)
@@ -1,4 +1,4 @@
<?php
// $Id$
-define("XOOPS_VERSION","XOOPS 2.0.18.1");
+define("XOOPS_VERSION","XOOPS 2.0.18.2");
?>
\ 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: <ph...@us...> - 2008-07-27 07:45:44
|
Revision: 1912
http://xoops.svn.sourceforge.net/xoops/?rev=1912&view=rev
Author: phppp
Date: 2008-07-27 07:45:52 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Updated version number
Modified Paths:
--------------
XoopsCore/releases/2.0.18.2-rc/htdocs/include/version.php
Modified: XoopsCore/releases/2.0.18.2-rc/htdocs/include/version.php
===================================================================
--- XoopsCore/releases/2.0.18.2-rc/htdocs/include/version.php 2008-07-27 07:30:38 UTC (rev 1911)
+++ XoopsCore/releases/2.0.18.2-rc/htdocs/include/version.php 2008-07-27 07:45:52 UTC (rev 1912)
@@ -1,4 +1,4 @@
<?php
// $Id$
-define("XOOPS_VERSION","XOOPS 2.0.18.1");
+define("XOOPS_VERSION","XOOPS 2.0.18.2 RC");
?>
\ 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: <ph...@us...> - 2008-07-27 07:30:30
|
Revision: 1911
http://xoops.svn.sourceforge.net/xoops/?rev=1911&view=rev
Author: phppp
Date: 2008-07-27 07:30:38 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Created 2.0.18.2 RC release branch
Added Paths:
-----------
XoopsCore/releases/2.0.18.2-rc/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 07:17:11
|
Revision: 1910
http://xoops.svn.sourceforge.net/xoops/?rev=1910&view=rev
Author: phppp
Date: 2008-07-27 07:17:20 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Filtered input parameter 'fct' in /modules/system/admin.php
Modified Paths:
--------------
XoopsCore/trunk/docs/changelog.txt
XoopsCore/trunk/htdocs/modules/system/admin.php
Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt 2008-07-27 07:15:16 UTC (rev 1909)
+++ XoopsCore/trunk/docs/changelog.txt 2008-07-27 07:17:20 UTC (rev 1910)
@@ -9,6 +9,7 @@
- Fixed bug #2006730: Permissions were not adequately checked for some actions in imagemanager (dugris/beckmi)
- Fixed a bug in path permission check for installer: xoops_lib should not be checked (phppp/ncnynl)
- Added permission check to user profile page (phppp/peterr)
+- Filtered input parameter 'fct' in /modules/system/admin.php (phppp)
- Modified language files:
/modules/system/language/english/admin/preferences.php (phppp)
Modified: XoopsCore/trunk/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin.php 2008-07-27 07:15:16 UTC (rev 1909)
+++ XoopsCore/trunk/htdocs/modules/system/admin.php 2008-07-27 07:17:20 UTC (rev 1910)
@@ -30,125 +30,126 @@
// ------------------------------------------------------------------------- //
if (isset($_POST['fct'])) {
- $fct = trim($_POST['fct']);
+ $fct = trim($_POST['fct']);
}
if (isset($_GET['fct'])) {
- $fct = trim($_GET['fct']);
+ $fct = trim($_GET['fct']);
}
if (isset($fct) && $fct == "users") {
- $xoopsOption['pagetype'] = "user";
+ $xoopsOption['pagetype'] = "user";
}
include "../../mainfile.php";
include XOOPS_ROOT_PATH."/include/cp_functions.php";
if ( file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php") ) {
- include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
+ include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
} else {
- include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
+ include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
}
include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
$admintest = 0;
if (is_object($xoopsUser)) {
- $xoopsModule =& XoopsModule::getByDirname("system");
- if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
- exit();
- }
- $admintest=1;
+ $xoopsModule =& XoopsModule::getByDirname("system");
+ if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
+ }
+ $admintest=1;
} else {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
- exit();
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
}
// include system category definitions
include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
$error = false;
if ($admintest != 0) {
- if (isset($fct) && $fct != '') {
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
-
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
- include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
- } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
- include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
- }
- include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
- $sysperm_handler =& xoops_gethandler('groupperm');
- $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
- unset($modversion);
- if ($category > 0) {
- $groups = $xoopsUser->getGroups();
- if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
- include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php";
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
- } elseif ($fct == 'version') {
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
- include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
+ if (isset($fct) && $fct != '') {
+ $fct = preg_replace("/[^a-z0-9_\-]/i", "", $fct);
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
+
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
+ } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
+ }
+ include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
+ $sysperm_handler =& xoops_gethandler('groupperm');
+ $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
+ unset($modversion);
+ if ($category > 0) {
+ $groups = $xoopsUser->getGroups();
+ if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
+ include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php";
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
+ } elseif ($fct == 'version') {
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
+ include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
}
if (false != $error) {
- xoops_cp_header();
- echo "<h4>"._MD_AM_CONFIG."</h4>";
- echo '<table class="outer" cellpadding="4" cellspacing="1">';
- echo '<tr>';
- $groups = $xoopsUser->getGroups();
- $all_ok = false;
- if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
- $sysperm_handler =& xoops_gethandler('groupperm');
- $ok_syscats = $sysperm_handler->getItemIds('system_admin', $groups);
- } else {
- $all_ok = true;
- }
- require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
- $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
- $dirlist = XoopsLists::getDirListAsArray($admin_dir);
- $counter = 0;
- $class = 'even';
- foreach($dirlist as $file){
- include $admin_dir.'/'.$file.'/xoops_version.php';
- if ($modversion['hasAdmin']) {
- $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
- if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
- echo "<td class='$class' align='center' valign='bottom' width='19%'>";
- echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><strong>" .trim($modversion['name'])."</strong></a>\n";
- echo "</td>";
- $counter++;
- $class = ($class == 'even') ? 'odd' : 'even';
- }
- if ( $counter > 4 ) {
- $counter = 0;
- echo "</tr>";
- echo "<tr>";
- }
- }
- unset($modversion);
- }
- unset($dirlist);
- while ($counter < 5) {
- echo '<td class="'.$class.'"> </td>';
- $class = ($class == 'even') ? 'odd' : 'even';
- $counter++;
- }
- echo '</tr></table>';
+ xoops_cp_header();
+ echo "<h4>"._MD_AM_CONFIG."</h4>";
+ echo '<table class="outer" cellpadding="4" cellspacing="1">';
+ echo '<tr>';
+ $groups = $xoopsUser->getGroups();
+ $all_ok = false;
+ if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ $sysperm_handler =& xoops_gethandler('groupperm');
+ $ok_syscats = $sysperm_handler->getItemIds('system_admin', $groups);
+ } else {
+ $all_ok = true;
+ }
+ require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
+ $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
+ $dirlist = XoopsLists::getDirListAsArray($admin_dir);
+ $counter = 0;
+ $class = 'even';
+ foreach($dirlist as $file){
+ include $admin_dir.'/'.$file.'/xoops_version.php';
+ if ($modversion['hasAdmin']) {
+ $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
+ if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
+ echo "<td class='$class' align='center' valign='bottom' width='19%'>";
+ echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><strong>" .trim($modversion['name'])."</strong></a>\n";
+ echo "</td>";
+ $counter++;
+ $class = ($class == 'even') ? 'odd' : 'even';
+ }
+ if ( $counter > 4 ) {
+ $counter = 0;
+ echo "</tr>";
+ echo "<tr>";
+ }
+ }
+ unset($modversion);
+ }
+ unset($dirlist);
+ while ($counter < 5) {
+ echo '<td class="'.$class.'"> </td>';
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $counter++;
+ }
+ echo '</tr></table>';
xoops_cp_footer();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 07:15:13
|
Revision: 1909
http://xoops.svn.sourceforge.net/xoops/?rev=1909&view=rev
Author: phppp
Date: 2008-07-27 07:15:16 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Fixed bug #2006730: Permissions were not adequately checked for some actions in imagemanager
Modified Paths:
--------------
XoopsCore/trunk/docs/changelog.txt
XoopsCore/trunk/htdocs/modules/system/admin/images/main.php
Modified: XoopsCore/trunk/docs/changelog.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.txt 2008-07-27 06:52:24 UTC (rev 1908)
+++ XoopsCore/trunk/docs/changelog.txt 2008-07-27 07:15:16 UTC (rev 1909)
@@ -6,6 +6,7 @@
2008/07/26: Version 2.3.0 RC
============================
- Fixed bug #2011644 which Smarty cache path was wrongly configured, cleaned up deprecated paths (phppp/ad...@sf...)
+- Fixed bug #2006730: Permissions were not adequately checked for some actions in imagemanager (dugris/beckmi)
- Fixed a bug in path permission check for installer: xoops_lib should not be checked (phppp/ncnynl)
- Added permission check to user profile page (phppp/peterr)
Modified: XoopsCore/trunk/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/images/main.php 2008-07-27 06:52:24 UTC (rev 1908)
+++ XoopsCore/trunk/htdocs/modules/system/admin/images/main.php 2008-07-27 07:15:16 UTC (rev 1909)
@@ -47,6 +47,33 @@
if (isset($_GET['imgcat_id'])) {
$imgcat_id = intval($_GET['imgcat_id']);
}
+
+ $gperm_handler =& xoops_gethandler('groupperm');
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+
+ // check READ right by category before continue
+ if ( isset($imgcat_id) && $op == 'listimg' ) {
+ $imgcat_read = $gperm_handler->checkRight( 'imgcat_read', $imgcat_id, $groups, $xoopsModule->mid() );
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imgcat_id, $groups, $xoopsModule->mid() );
+ if (!$imgcat_read && !$imgcat_write) {
+ redirect_header('admin.php?fct=images',1);
+ }
+ }
+
+ // check WRITE right by category before continue
+ if ( isset($imgcat_id) && ($op == 'addfile' || $op == 'editcat' || $op == 'updatecat' || $op == 'delcatok' || $op == 'delcat') ) {
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imgcat_id, $groups, $xoopsModule->mid() );
+ if (!$imgcat_write) {
+ redirect_header('admin.php?fct=images',1);
+ }
+ }
+
+ // Only website administator can delete categories or images
+ if ( !in_array(XOOPS_GROUP_ADMIN, $groups) && ($op == 'delfile' || $op == 'delfileok' || $op == 'delcatok' || $op == 'delcat') ) {
+ redirect_header('admin.php?fct=images',1);
+ }
+
+
if ($op == 'list') {
$imgcat_handler = xoops_gethandler('imagecategory');
$imagecategorys = $imgcat_handler->getObjects();
@@ -55,12 +82,21 @@
$catcount = count($imagecategorys);
$image_handler =& xoops_gethandler('image');
for ($i = 0; $i < $catcount; $i++) {
- $count = $image_handler->getCount(new Criteria('imgcat_id', $imagecategorys[$i]->getVar('imgcat_id')));
- echo '<li>'.$imagecategorys[$i]->getVar('imgcat_name').' ('.sprintf(_NUMIMAGES, '<strong>'.$count.'</strong>').') [<a href="admin.php?fct=images&op=listimg&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._LIST.'</a>] [<a href="admin.php?fct=images&op=editcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._EDIT.'</a>]';
- if ($imagecategorys[$i]->getVar('imgcat_type') == 'C') {
- echo ' [<a href="admin.php?fct=images&op=delcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._DELETE.'</a>]';
+ $imgcat_read = $gperm_handler->checkRight( 'imgcat_read', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid() );
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid() );
+ if ( $imgcat_read || $imgcat_write ) {
+ $count = $image_handler->getCount(new Criteria('imgcat_id', $imagecategorys[$i]->getVar('imgcat_id')));
+ echo '<li>'.$imagecategorys[$i]->getVar('imgcat_name').' ('.sprintf(_NUMIMAGES, '<strong>'.$count.'</strong>').')';
+ echo ' [<a href="admin.php?fct=images&op=listimg&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._LIST.'</a>]';
+
+ if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ echo ' [<a href="admin.php?fct=images&op=editcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._EDIT.'</a>]';
+ if ($imagecategorys[$i]->getVar('imgcat_type') == 'C') {
+ echo ' [<a href="admin.php?fct=images&op=delcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._DELETE.'</a>]';
+ }
+ }
+ echo '</li>';
}
- echo '</li>';
}
echo '</ul>';
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
@@ -69,7 +105,7 @@
$form->setExtra('enctype="multipart/form-data"');
$form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255), true);
$select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id');
- $select->addOptionArray($imgcat_handler->getList());
+ $select->addOptionArray($imgcat_handler->getList($groups, 'imgcat_write'));
$form->addElement($select, true);
$form->addElement(new XoopsFormFile(_IMAGEFILE, 'image_file', 5000000));
$form->addElement(new XoopsFormText(_IMGWEIGHT, 'image_weight', 3, 4, 0));
@@ -79,22 +115,26 @@
$form->addElement(new XoopsFormButton('', 'img_button', _SUBMIT, 'submit'));
$form->display();
}
- $form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', 'admin.php', 'post', true);
- $form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255), true);
- $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATRGRP, 'readgroup', true, XOOPS_GROUP_ADMIN, 5, true));
- $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATWGRP, 'writegroup', true, XOOPS_GROUP_ADMIN, 5, true));
- $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, 50000));
- $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, 120));
- $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, 120));
- $form->addElement(new XoopsFormText(_MD_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
- $form->addElement(new XoopsFormRadioYN(_MD_IMGCATDISPLAY, 'imgcat_display', 1, _YES, _NO));
- $storetype = new XoopsFormRadio(_MD_IMGCATSTRTYPE.'<br /><span style="color:#ff0000;">'._MD_STRTYOPENG.'</span>', 'imgcat_storetype', 'file');
- $storetype->addOptionArray(array('file' => _MD_ASFILE, 'db' => _MD_INDB));
- $form->addElement($storetype);
- $form->addElement(new XoopsFormHidden('op', 'addcat'));
- $form->addElement(new XoopsFormHidden('fct', 'images'));
- $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
- $form->display();
+
+
+ if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ $form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', 'admin.php', 'post', true);
+ $form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255), true);
+ $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATRGRP, 'readgroup', true, XOOPS_GROUP_ADMIN, 5, true));
+ $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATWGRP, 'writegroup', true, XOOPS_GROUP_ADMIN, 5, true));
+ $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, 50000));
+ $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, 120));
+ $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, 120));
+ $form->addElement(new XoopsFormText(_MD_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
+ $form->addElement(new XoopsFormRadioYN(_MD_IMGCATDISPLAY, 'imgcat_display', 1, _YES, _NO));
+ $storetype = new XoopsFormRadio(_MD_IMGCATSTRTYPE.'<br /><span style="color:#ff0000;">'._MD_STRTYOPENG.'</span>', 'imgcat_storetype', 'file');
+ $storetype->addOptionArray(array('file' => _MD_ASFILE, 'db' => _MD_INDB));
+ $form->addElement($storetype);
+ $form->addElement(new XoopsFormHidden('op', 'addcat'));
+ $form->addElement(new XoopsFormHidden('fct', 'images'));
+ $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
+ $form->display();
+ }
xoops_cp_footer();
exit();
}
@@ -104,6 +144,9 @@
if ($imgcat_id <= 0) {
redirect_header('admin.php?fct=images',1);
}
+
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imgcat_id, $groups, $xoopsModule->mid() );
+
$imgcat_handler = xoops_gethandler('imagecategory');
$imagecategory =& $imgcat_handler->get($imgcat_id);
if (!is_object($imagecategory)) {
@@ -118,29 +161,56 @@
$criteria->setStart($start);
$criteria->setLimit(20);
$images = $image_handler->getObjects($criteria, true, false);
- echo '<form action="admin.php" method="post">';
+
+ if ($imgcat_write) {
+ echo '<form action="admin.php" method="post">';
+ }
foreach (array_keys($images) as $i) {
+ $rowspan = ($imgcat_write) ? 6 : 2;
- echo '<table width="100%" class="outer"><tr><td width="30%" rowspan="6">';
+ echo '<table width="100%" class="outer">';
+ echo '<tr><td width="30%" rowspan="' . $rowspan . '">';
if ($imagecategory->getVar('imgcat_storetype') == 'db') {
echo '<img src="'.XOOPS_URL.'/image.php?id='.$i.'" alt="" />';
} else {
echo '<img src="'.XOOPS_UPLOAD_URL.'/'.$images[$i]->getVar('image_name').'" alt="" />';
}
- echo '</td><td class="head">'._IMAGENAME,'</td><td class="even"><input type="hidden" name="image_id[]" value="'.$i.'" /><input type="text" name="image_nicename[]" value="'.$images[$i]->getVar('image_nicename', 'E').'" size="20" maxlength="255" /></td></tr><tr><td class="head">'._IMAGEMIME.'</td><td class="odd">'.$images[$i]->getVar('image_mimetype').'</td></tr><tr><td class="head">'._IMAGECAT.'</td><td class="even"><select name="imgcat_id[]" size="1">';
- $list =& $imgcat_handler->getList(array(), null, null, $imagecategory->getVar('imgcat_storetype'));
- foreach ($list as $value => $name) {
- $sel = '';
- if ($value == $images[$i]->getVar('imgcat_id')) {
- $sel = ' selected="selected"';
+ echo '</td>';
+
+ echo '<td class="head">'._IMAGENAME,'</td><td class="even">';
+ if ($imgcat_write) {
+ echo '<input type="hidden" name="image_id[]" value="'.$i.'" /><input type="text" name="image_nicename[]" value="'.$images[$i]->getVar('image_nicename', 'E').'" size="20" maxlength="255" />';
+ } else {
+ echo '<strong>' . $images[$i]->getVar('image_nicename') . '</strong>';
+ }
+ echo '</td></tr>';
+
+ echo '<tr><td class="head">'._IMAGEMIME.'</td><td class="odd">'.$images[$i]->getVar('image_mimetype').'</td></tr>';
+
+ if ($imgcat_write) {
+ echo '<tr><td class="head">'._IMAGECAT.'</td><td class="even">';
+ echo '<select name="imgcat_id[]" size="1">';
+ $list =& $imgcat_handler->getList($groups, 'imgcat_write', null, $imagecategory->getVar('imgcat_storetype'));
+ foreach ($list as $value => $name) {
+ $sel = '';
+ if ($value == $images[$i]->getVar('imgcat_id')) {
+ $sel = ' selected="selected"';
+ }
+ echo '<option value="'.$value.'"'.$sel.'>'.$name.'</option>';
}
- echo '<option value="'.$value.'"'.$sel.'>'.$name.'</option>';
+ echo '</select></td></tr>';
+
+ echo '<tr><td class="head">'._IMGWEIGHT.'</td><td class="odd"><input type="text" name="image_weight[]" value="'.$images[$i]->getVar('image_weight').'" size="3" maxlength="4" /></td></tr>';
+ echo '<tr><td class="head">'._IMGDISPLAY.'</td><td class="even"><input type="checkbox" name="image_display[]" value="1"';
+ if ($images[$i]->getVar('image_display') == 1) {
+ echo ' checked="checked"';
+ }
+ echo ' /></td></tr>';
}
- echo '</select></td></tr><tr><td class="head">'._IMGWEIGHT.'</td><td class="odd"><input type="text" name="image_weight[]" value="'.$images[$i]->getVar('image_weight').'" size="3" maxlength="4" /></td></tr><tr><td class="head">'._IMGDISPLAY.'</td><td class="even"><input type="checkbox" name="image_display[]" value="1"';
- if ($images[$i]->getVar('image_display') == 1) {
- echo ' checked="checked"';
+ if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ echo '<tr><td class="head"> </td><td class="odd"><a href="admin.php?fct=images&op=delfile&image_id='.$i.'">'._DELETE.'</a></td></tr>';
}
- echo ' /></td></tr><tr><td class="head"> </td><td class="odd"><a href="admin.php?fct=images&op=delfile&image_id='.$i.'">'._DELETE.'</a></td></tr></table><br />';
+ echo '</table><br />';
}
if ($imgcount > 0) {
if ($imgcount > 20) {
@@ -148,7 +218,9 @@
$nav = new XoopsPageNav($imgcount, 20, $start, 'start', 'fct=images&op=listimg&imgcat_id='.$imgcat_id);
echo '<div text-align="right">'.$nav->renderNav().'</div>';
}
- echo '<div style="text-align:center;"><input type="hidden" name="op" value="save" /><input type="hidden" name="fct" value="images" />'.$GLOBALS['xoopsSecurity']->getTokenHTML().'<input type="submit" name="submit" value="'._SUBMIT.'" /></div></form>';
+ if ($imgcat_write) {
+ echo '<div style="text-align:center;"><input type="hidden" name="op" value="save" /><input type="hidden" name="fct" value="images" />'.$GLOBALS['xoopsSecurity']->getTokenHTML().'<input type="submit" name="submit" value="'._SUBMIT.'" /></div></form>';
+ }
}
xoops_cp_footer();
exit();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 06:52:16
|
Revision: 1908
http://xoops.svn.sourceforge.net/xoops/?rev=1908&view=rev
Author: phppp
Date: 2008-07-27 06:52:24 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Fixed a bug in custom session with regenerateId is enabled
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18.2/htdocs/class/xoopssecurity.php
XoopsCore/branches/2.0.x/2.0.18.2/htdocs/kernel/session.php
Modified: XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt 2008-07-27 06:15:32 UTC (rev 1907)
+++ XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt 2008-07-27 06:52:24 UTC (rev 1908)
@@ -7,6 +7,7 @@
============================
- Fixed #2006730: Permissions were not adequately checked for some actions in imagemanager (dugris/beckmi)
- Filtered input parameter 'fct' in /modules/system/admin.php (phppp)
+- Fixed a bug in custom session with regenerateId is enabled (phppp)
============================
Modified: XoopsCore/branches/2.0.x/2.0.18.2/htdocs/class/xoopssecurity.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/htdocs/class/xoopssecurity.php 2008-07-27 06:15:32 UTC (rev 1907)
+++ XoopsCore/branches/2.0.x/2.0.18.2/htdocs/class/xoopssecurity.php 2008-07-27 06:52:24 UTC (rev 1908)
@@ -72,7 +72,8 @@
{
$this->garbageCollection($name);
if ($timeout == 0) {
- $timeout = $GLOBALS['xoopsConfig']['session_expire'] * 60; //session_expire is in minutes, we need seconds
+ $expire = @ini_get('session.gc_maxlifetime');
+ $timeout = ($expire > 0) ? $expire : 900;
}
$token_id = md5(uniqid(rand(), true));
// save token data on the server
Modified: XoopsCore/branches/2.0.x/2.0.18.2/htdocs/kernel/session.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/htdocs/kernel/session.php 2008-07-27 06:15:32 UTC (rev 1907)
+++ XoopsCore/branches/2.0.x/2.0.18.2/htdocs/kernel/session.php 2008-07-27 06:52:24 UTC (rev 1908)
@@ -31,9 +31,9 @@
/**
* @package kernel
*
- * @author Kazumi Ono <on...@xo...>
- * @author Taiwen Jiang <ph...@us...>
- * @copyright copyright (c) The XOOPS project XOOPS.org
+ * @author Kazumi Ono <on...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @copyright copyright (c) The XOOPS project XOOPS.org
*/
@@ -41,9 +41,9 @@
* Handler for a session
* @package kernel
*
- * @author Kazumi Ono <on...@xo...>
- * @author Taiwen Jiang <ph...@us...>
- * @copyright copyright (c) The XOOPS project XOOPS.org
+ * @author Kazumi Ono <on...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @copyright copyright (c) The XOOPS project XOOPS.org
*/
class XoopsSessionHandler
{
@@ -51,8 +51,8 @@
/**
* Database connection
*
- * @var object
- * @access private
+ * @var object
+ * @access private
*/
var $db;
@@ -60,29 +60,29 @@
* Security checking level
*
* Possible value:
- * 0 - no check;
- * 1 - check browser characteristics (HTTP_USER_AGENT/HTTP_ACCEPT_LANGUAGE), to be implemented in the future now;
- * 2 - check browser and IP A.B;
- * 3 - check browser and IP A.B.C, recommended;
- * 4 - check browser and IP A.B.C.D;
+ * 0 - no check;
+ * 1 - check browser characteristics (HTTP_USER_AGENT/HTTP_ACCEPT_LANGUAGE), to be implemented in the future now;
+ * 2 - check browser and IP A.B;
+ * 3 - check browser and IP A.B.C, recommended;
+ * 4 - check browser and IP A.B.C.D;
*
- * @var int
- * @access public
+ * @var int
+ * @access public
*/
var $securityLevel = 3;
/**
* Enable regenerate_id
*
- * @var bool
- * @access public
+ * @var bool
+ * @access public
*/
var $enableRegenerateId = false;
/**
* Constructor
*
- * @param object $db reference to the {@link XoopsDatabase} object
+ * @param object $db reference to the {@link XoopsDatabase} object
*
*/
function XoopsSessionHandler(&$db)
@@ -93,46 +93,46 @@
/**
* Open a session
*
- * @param string $save_path
- * @param string $session_name
+ * @param string $save_path
+ * @param string $session_name
*
- * @return bool
+ * @return bool
*/
function open($save_path, $session_name)
- {
+ {
return true;
}
/**
* Close a session
*
- * @return bool
+ * @return bool
*/
function close()
- {
- $this->gc_force();
+ {
+ $this->gc_force();
return true;
}
/**
* Read a session from the database
*
- * @param string &sess_id ID of the session
+ * @param string &sess_id ID of the session
*
- * @return array Session data
+ * @return array Session data
*/
function read($sess_id)
- {
+ {
$sql = sprintf('SELECT sess_data, sess_ip FROM %s WHERE sess_id = %s', $this->db->prefix('session'), $this->db->quoteString($sess_id));
if (false != $result = $this->db->query($sql)) {
if (list($sess_data, $sess_ip) = $this->db->fetchRow($result)) {
- if ($this->securityLevel > 1) {
- $pos = strpos($sess_ip, ".", $this->securityLevel - 1);
- if (strncmp($sess_ip, $_SERVER['REMOTE_ADDR'], $pos)) {
- $sess_data = '';
- }
- }
- return $sess_data;
+ if ($this->securityLevel > 1) {
+ $pos = strpos($sess_ip, ".", $this->securityLevel - 1);
+ if (strncmp($sess_ip, $_SERVER['REMOTE_ADDR'], $pos)) {
+ $sess_data = '';
+ }
+ }
+ return $sess_data;
}
}
return '';
@@ -147,15 +147,15 @@
* @return bool
**/
function write($sess_id, $sess_data)
- {
- $sess_id = $this->db->quoteString($sess_id);
- $sql = sprintf('UPDATE %s SET sess_updated = %u, sess_data = %s WHERE sess_id = %s', $this->db->prefix('session'), time(), $this->db->quoteString($sess_data), $sess_id);
- $this->db->queryF($sql);
- if (!$this->db->getAffectedRows()) {
- $sql = sprintf('INSERT INTO %s (sess_id, sess_updated, sess_ip, sess_data) VALUES (%s, %u, %s, %s)', $this->db->prefix('session'), $sess_id, time(), $this->db->quoteString($_SERVER['REMOTE_ADDR']), $this->db->quoteString($sess_data));
- return $this->db->queryF($sql);
+ {
+ $sess_id = $this->db->quoteString($sess_id);
+ $sql = sprintf('UPDATE %s SET sess_updated = %u, sess_data = %s WHERE sess_id = %s', $this->db->prefix('session'), time(), $this->db->quoteString($sess_data), $sess_id);
+ $this->db->queryF($sql);
+ if (!$this->db->getAffectedRows()) {
+ $sql = sprintf('INSERT INTO %s (sess_id, sess_updated, sess_ip, sess_data) VALUES (%s, %u, %s, %s)', $this->db->prefix('session'), $sess_id, time(), $this->db->quoteString($_SERVER['REMOTE_ADDR']), $this->db->quoteString($sess_data));
+ return $this->db->queryF($sql);
}
- return true;
+ return true;
}
/**
@@ -167,7 +167,7 @@
**/
function destroy($sess_id)
{
- $sql = sprintf('DELETE FROM %s WHERE sess_id = %s', $this->db->prefix('session'), $this->db->quoteString($sess_id));
+ $sql = sprintf('DELETE FROM %s WHERE sess_id = %s', $this->db->prefix('session'), $this->db->quoteString($sess_id));
if ( !$result = $this->db->queryF($sql) ) {
return false;
}
@@ -178,16 +178,16 @@
* Garbage Collector
*
* @param int $expire Time in seconds until a session expires
- * @return bool
+ * @return bool
**/
function gc($expire)
{
- if (empty($expire)) {
- return true;
- }
-
+ if (empty($expire)) {
+ return true;
+ }
+
$mintime = time() - intval($expire);
- $sql = sprintf('DELETE FROM %s WHERE sess_updated < %u', $this->db->prefix('session'), $mintime);
+ $sql = sprintf('DELETE FROM %s WHERE sess_updated < %u', $this->db->prefix('session'), $mintime);
return $this->db->queryF($sql);
}
@@ -196,10 +196,11 @@
**/
function gc_force()
{
- if (rand(1, 100) < 11) {
- $expiration = empty($GLOBALS["xoopsConfig"]["session_expire"]) ? @ini_get('session.gc_maxlifetime') : $GLOBALS["xoopsConfig"]["session_expire"] * 60;
- $this->gc($expiration);
- }
+ if (rand(1, 100) < 11) {
+ $expire = @ini_get('session.gc_maxlifetime');
+ $expire = ($expire > 0) ? $expire : 900;
+ $this->gc($expire);
+ }
}
/**
@@ -208,19 +209,19 @@
* To be refactored
*
* @param bool $delete_old_session
- * @return bool
+ * @return bool
**/
function regenerate_id($delete_old_session = false)
{
- if (!$this->enableRegenerateId) {
- return true;
- }
-
$phpversion = phpversion();
+ if (!$this->enableRegenerateId) {
+ $success = true;
+
// parameter "delete_old_session" only available as of PHP 5.1.0
- if (version_compare($phpversion, "5.1.0", ">=")) {
+ } elseif (version_compare($phpversion, "5.1.0", ">=")) {
$success = session_regenerate_id($delete_old_session);
+
} else {
$old_session_id = session_id();
// session_regenerate_id function available as of PHP 4.3.2
@@ -241,8 +242,8 @@
$this->destroy($old_session_id);
// switch old session to new one
} else {
- $sql = sprintf('UPDATE %s SET sess_id = %s WHERE sess_id = %s', $this->db->prefix('session'), $this->db->quoteString($session_id), $this->db->quoteString($old_session_id));
- $this->db->queryF($sql);
+ $sql = sprintf('UPDATE %s SET sess_id = %s WHERE sess_id = %s', $this->db->prefix('session'), $this->db->quoteString($session_id), $this->db->quoteString($old_session_id));
+ $this->db->queryF($sql);
}
$success = true;
}
@@ -264,7 +265,7 @@
*
* @param string $sess_id session ID
* @param int $expire Time in seconds until a session expires
- * @return bool
+ * @return bool
**/
function update_cookie($sess_id = null, $expire = null)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 06:15:24
|
Revision: 1907
http://xoops.svn.sourceforge.net/xoops/?rev=1907&view=rev
Author: phppp
Date: 2008-07-27 06:15:32 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Filtered input parameter 'fct' in /modules/system/admin.php
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin.php
Modified: XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt 2008-07-27 04:55:40 UTC (rev 1906)
+++ XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt 2008-07-27 06:15:32 UTC (rev 1907)
@@ -6,6 +6,7 @@
2008/07/26: Version 2.0.18.2
============================
- Fixed #2006730: Permissions were not adequately checked for some actions in imagemanager (dugris/beckmi)
+- Filtered input parameter 'fct' in /modules/system/admin.php (phppp)
============================
Modified: XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin.php 2008-07-27 04:55:40 UTC (rev 1906)
+++ XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin.php 2008-07-27 06:15:32 UTC (rev 1907)
@@ -30,125 +30,126 @@
// ------------------------------------------------------------------------- //
if (isset($_POST['fct'])) {
- $fct = trim($_POST['fct']);
+ $fct = trim($_POST['fct']);
}
if (isset($_GET['fct'])) {
- $fct = trim($_GET['fct']);
+ $fct = trim($_GET['fct']);
}
if (isset($fct) && $fct == "users") {
- $xoopsOption['pagetype'] = "user";
+ $xoopsOption['pagetype'] = "user";
}
include "../../mainfile.php";
include XOOPS_ROOT_PATH."/include/cp_functions.php";
if ( file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php") ) {
- include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
+ include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php";
} else {
- include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
+ include XOOPS_ROOT_PATH."/modules/system/language/english/admin.php";
}
include_once XOOPS_ROOT_PATH."/class/xoopsmodule.php";
$admintest = 0;
if (is_object($xoopsUser)) {
- $xoopsModule =& XoopsModule::getByDirname("system");
- if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
- exit();
- }
- $admintest=1;
+ $xoopsModule =& XoopsModule::getByDirname("system");
+ if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
+ }
+ $admintest=1;
} else {
- redirect_header(XOOPS_URL."/",3,_NOPERM);
- exit();
+ redirect_header(XOOPS_URL."/",3,_NOPERM);
+ exit();
}
// include system category definitions
include_once XOOPS_ROOT_PATH."/modules/system/constants.php";
$error = false;
if ($admintest != 0) {
- if (isset($fct) && $fct != '') {
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
-
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
- include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
- } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
- include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
- }
- include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
- $sysperm_handler =& xoops_gethandler('groupperm');
- $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
- unset($modversion);
- if ($category > 0) {
- $groups =& $xoopsUser->getGroups();
- if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
- include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php";
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
- } elseif ($fct == 'version') {
- if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
- include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
- } else {
- $error = true;
- }
+ if (isset($fct) && $fct != '') {
+ $fct = preg_replace("/[^a-z0-9_\-]/i", "", $fct);
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
+
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
+ } elseif (file_exists(XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php")) {
+ include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
+ }
+ include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
+ $sysperm_handler =& xoops_gethandler('groupperm');
+ $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
+ unset($modversion);
+ if ($category > 0) {
+ $groups =& $xoopsUser->getGroups();
+ if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))){
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php")) {
+ include_once XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/main.php";
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
+ } elseif ($fct == 'version') {
+ if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/version/main.php")) {
+ include_once XOOPS_ROOT_PATH."/modules/system/admin/version/main.php";
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
+ } else {
+ $error = true;
+ }
}
if (false != $error) {
- xoops_cp_header();
- echo "<h4>"._MD_AM_CONFIG."</h4>";
- echo '<table class="outer" cellpadding="4" cellspacing="1">';
- echo '<tr>';
- $groups = $xoopsUser->getGroups();
- $all_ok = false;
- if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
- $sysperm_handler =& xoops_gethandler('groupperm');
- $ok_syscats =& $sysperm_handler->getItemIds('system_admin', $groups);
- } else {
- $all_ok = true;
- }
- require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
- $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
- $dirlist = XoopsLists::getDirListAsArray($admin_dir);
- $counter = 0;
- $class = 'even';
- foreach($dirlist as $file){
- include $admin_dir.'/'.$file.'/xoops_version.php';
- if ($modversion['hasAdmin']) {
- $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
- if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
- echo "<td class='$class' align='center' valign='bottom' width='19%'>";
- echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n";
- echo "</td>";
- $counter++;
- $class = ($class == 'even') ? 'odd' : 'even';
- }
- if ( $counter > 4 ) {
- $counter = 0;
- echo "</tr>";
- echo "<tr>";
- }
- }
- unset($modversion);
- }
- unset($dirlist);
- while ($counter < 5) {
- echo '<td class="'.$class.'"> </td>';
- $class = ($class == 'even') ? 'odd' : 'even';
- $counter++;
- }
- echo '</tr></table>';
+ xoops_cp_header();
+ echo "<h4>"._MD_AM_CONFIG."</h4>";
+ echo '<table class="outer" cellpadding="4" cellspacing="1">';
+ echo '<tr>';
+ $groups = $xoopsUser->getGroups();
+ $all_ok = false;
+ if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ $sysperm_handler =& xoops_gethandler('groupperm');
+ $ok_syscats =& $sysperm_handler->getItemIds('system_admin', $groups);
+ } else {
+ $all_ok = true;
+ }
+ require_once XOOPS_ROOT_PATH."/class/xoopslists.php";
+ $admin_dir = XOOPS_ROOT_PATH."/modules/system/admin";
+ $dirlist = XoopsLists::getDirListAsArray($admin_dir);
+ $counter = 0;
+ $class = 'even';
+ foreach($dirlist as $file){
+ include $admin_dir.'/'.$file.'/xoops_version.php';
+ if ($modversion['hasAdmin']) {
+ $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
+ if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
+ echo "<td class='$class' align='center' valign='bottom' width='19%'>";
+ echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n";
+ echo "</td>";
+ $counter++;
+ $class = ($class == 'even') ? 'odd' : 'even';
+ }
+ if ( $counter > 4 ) {
+ $counter = 0;
+ echo "</tr>";
+ echo "<tr>";
+ }
+ }
+ unset($modversion);
+ }
+ unset($dirlist);
+ while ($counter < 5) {
+ echo '<td class="'.$class.'"> </td>';
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $counter++;
+ }
+ echo '</tr></table>';
xoops_cp_footer();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 04:55:32
|
Revision: 1906
http://xoops.svn.sourceforge.net/xoops/?rev=1906&view=rev
Author: phppp
Date: 2008-07-27 04:55:40 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Fixed #2006730: Permissions were not adequately checked for some actions in imagemanager
Modified Paths:
--------------
XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt
XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin/images/main.php
Modified: XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt 2008-07-27 03:05:37 UTC (rev 1905)
+++ XoopsCore/branches/2.0.x/2.0.18.2/docs/changelog.txt 2008-07-27 04:55:40 UTC (rev 1906)
@@ -1,7 +1,14 @@
XOOPS Changelog
+
============================
+2008/07/26: Version 2.0.18.2
+============================
+- Fixed #2006730: Permissions were not adequately checked for some actions in imagemanager (dugris/beckmi)
+
+
+============================
2008/02/16: Version 2.0.18.1
============================
- Fixed #1854203 : XoopsTree::getNicePathFromId Add separator only if necessary (dugris)
Modified: XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin/images/main.php 2008-07-27 03:05:37 UTC (rev 1905)
+++ XoopsCore/branches/2.0.x/2.0.18.2/htdocs/modules/system/admin/images/main.php 2008-07-27 04:55:40 UTC (rev 1906)
@@ -47,20 +47,56 @@
if (isset($_GET['imgcat_id'])) {
$imgcat_id = intval($_GET['imgcat_id']);
}
+
+ $gperm_handler =& xoops_gethandler('groupperm');
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+
+ // check READ right by category before continue
+ if ( isset($imgcat_id) && $op == 'listimg' ) {
+ $imgcat_read = $gperm_handler->checkRight( 'imgcat_read', $imgcat_id, $groups, $xoopsModule->mid() );
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imgcat_id, $groups, $xoopsModule->mid() );
+ if (!$imgcat_read && !$imgcat_write) {
+ redirect_header('admin.php?fct=images',1);
+ }
+ }
+
+ // check WRITE right by category before continue
+ if ( isset($imgcat_id) && ($op == 'addfile' || $op == 'editcat' || $op == 'updatecat' || $op == 'delcatok' || $op == 'delcat') ) {
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imgcat_id, $groups, $xoopsModule->mid() );
+ if (!$imgcat_write) {
+ redirect_header('admin.php?fct=images',1);
+ }
+ }
+
+ // Only website administator can delete categories or images
+ if ( !in_array(XOOPS_GROUP_ADMIN, $groups) && ($op == 'delfile' || $op == 'delfileok' || $op == 'delcatok' || $op == 'delcat') ) {
+ redirect_header('admin.php?fct=images',1);
+ }
+
+
if ($op == 'list') {
$imgcat_handler = xoops_gethandler('imagecategory');
- $imagecategorys =& $imgcat_handler->getObjects();
+ $imagecategorys = $imgcat_handler->getObjects();
xoops_cp_header();
echo '<h4 style="text-align:left">'._IMGMANAGER.'</h4><ul>';
$catcount = count($imagecategorys);
$image_handler =& xoops_gethandler('image');
for ($i = 0; $i < $catcount; $i++) {
- $count = $image_handler->getCount(new Criteria('imgcat_id', $imagecategorys[$i]->getVar('imgcat_id')));
- echo '<li>'.$imagecategorys[$i]->getVar('imgcat_name').' ('.sprintf(_NUMIMAGES, '<b>'.$count.'</b>').') [<a href="admin.php?fct=images&op=listimg&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._LIST.'</a>] [<a href="admin.php?fct=images&op=editcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._EDIT.'</a>]';
- if ($imagecategorys[$i]->getVar('imgcat_type') == 'C') {
- echo ' [<a href="admin.php?fct=images&op=delcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._DELETE.'</a>]';
+ $imgcat_read = $gperm_handler->checkRight( 'imgcat_read', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid() );
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid() );
+ if ( $imgcat_read || $imgcat_write ) {
+ $count = $image_handler->getCount(new Criteria('imgcat_id', $imagecategorys[$i]->getVar('imgcat_id')));
+ echo '<li>'.$imagecategorys[$i]->getVar('imgcat_name').' ('.sprintf(_NUMIMAGES, '<b>'.$count.'</b>').')';
+ echo ' [<a href="admin.php?fct=images&op=listimg&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._LIST.'</a>]';
+
+ if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ echo ' [<a href="admin.php?fct=images&op=editcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._EDIT.'</a>]';
+ if ($imagecategorys[$i]->getVar('imgcat_type') == 'C') {
+ echo ' [<a href="admin.php?fct=images&op=delcat&imgcat_id='.$imagecategorys[$i]->getVar('imgcat_id').'">'._DELETE.'</a>]';
+ }
+ }
+ echo '</li>';
}
- echo '</li>';
}
echo '</ul>';
include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
@@ -69,7 +105,7 @@
$form->setExtra('enctype="multipart/form-data"');
$form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255), true);
$select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id');
- $select->addOptionArray($imgcat_handler->getList());
+ $select->addOptionArray($imgcat_handler->getList($groups, 'imgcat_write'));
$form->addElement($select, true);
$form->addElement(new XoopsFormFile(_IMAGEFILE, 'image_file', 5000000));
$form->addElement(new XoopsFormText(_IMGWEIGHT, 'image_weight', 3, 4, 0));
@@ -79,22 +115,26 @@
$form->addElement(new XoopsFormButton('', 'img_button', _SUBMIT, 'submit'));
$form->display();
}
- $form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', 'admin.php', 'post', true);
- $form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255), true);
- $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATRGRP, 'readgroup', true, XOOPS_GROUP_ADMIN, 5, true));
- $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATWGRP, 'writegroup', true, XOOPS_GROUP_ADMIN, 5, true));
- $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, 50000));
- $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, 120));
- $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, 120));
- $form->addElement(new XoopsFormText(_MD_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
- $form->addElement(new XoopsFormRadioYN(_MD_IMGCATDISPLAY, 'imgcat_display', 1, _YES, _NO));
- $storetype = new XoopsFormRadio(_MD_IMGCATSTRTYPE.'<br /><span style="color:#ff0000;">'._MD_STRTYOPENG.'</span>', 'imgcat_storetype', 'file');
- $storetype->addOptionArray(array('file' => _MD_ASFILE, 'db' => _MD_INDB));
- $form->addElement($storetype);
- $form->addElement(new XoopsFormHidden('op', 'addcat'));
- $form->addElement(new XoopsFormHidden('fct', 'images'));
- $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
- $form->display();
+
+
+ if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ $form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', 'admin.php', 'post', true);
+ $form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255), true);
+ $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATRGRP, 'readgroup', true, XOOPS_GROUP_ADMIN, 5, true));
+ $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATWGRP, 'writegroup', true, XOOPS_GROUP_ADMIN, 5, true));
+ $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, 50000));
+ $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, 120));
+ $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, 120));
+ $form->addElement(new XoopsFormText(_MD_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
+ $form->addElement(new XoopsFormRadioYN(_MD_IMGCATDISPLAY, 'imgcat_display', 1, _YES, _NO));
+ $storetype = new XoopsFormRadio(_MD_IMGCATSTRTYPE.'<br /><span style="color:#ff0000;">'._MD_STRTYOPENG.'</span>', 'imgcat_storetype', 'file');
+ $storetype->addOptionArray(array('file' => _MD_ASFILE, 'db' => _MD_INDB));
+ $form->addElement($storetype);
+ $form->addElement(new XoopsFormHidden('op', 'addcat'));
+ $form->addElement(new XoopsFormHidden('fct', 'images'));
+ $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
+ $form->display();
+ }
xoops_cp_footer();
exit();
}
@@ -104,6 +144,9 @@
if ($imgcat_id <= 0) {
redirect_header('admin.php?fct=images',1);
}
+
+ $imgcat_write = $gperm_handler->checkRight( 'imgcat_write', $imgcat_id, $groups, $xoopsModule->mid() );
+
$imgcat_handler = xoops_gethandler('imagecategory');
$imagecategory =& $imgcat_handler->get($imgcat_id);
if (!is_object($imagecategory)) {
@@ -117,30 +160,57 @@
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
$criteria->setStart($start);
$criteria->setLimit(20);
- $images =& $image_handler->getObjects($criteria, true, false);
- echo '<form action="admin.php" method="post">';
+ $images = $image_handler->getObjects($criteria, true, false);
+
+ if ($imgcat_write) {
+ echo '<form action="admin.php" method="post">';
+ }
foreach (array_keys($images) as $i) {
+ $rowspan = ($imgcat_write) ? 6 : 2;
- echo '<table width="100%" class="outer"><tr><td width="30%" rowspan="6">';
+ echo '<table width="100%" class="outer">';
+ echo '<tr><td width="30%" rowspan="' . $rowspan . '">';
if ($imagecategory->getVar('imgcat_storetype') == 'db') {
echo '<img src="'.XOOPS_URL.'/image.php?id='.$i.'" alt="" />';
} else {
echo '<img src="'.XOOPS_UPLOAD_URL.'/'.$images[$i]->getVar('image_name').'" alt="" />';
}
- echo '</td><td class="head">'._IMAGENAME,'</td><td class="even"><input type="hidden" name="image_id[]" value="'.$i.'" /><input type="text" name="image_nicename[]" value="'.$images[$i]->getVar('image_nicename', 'E').'" size="20" maxlength="255" /></td></tr><tr><td class="head">'._IMAGEMIME.'</td><td class="odd">'.$images[$i]->getVar('image_mimetype').'</td></tr><tr><td class="head">'._IMAGECAT.'</td><td class="even"><select name="imgcat_id[]" size="1">';
- $list =& $imgcat_handler->getList(array(), null, null, $imagecategory->getVar('imgcat_storetype'));
- foreach ($list as $value => $name) {
- $sel = '';
- if ($value == $images[$i]->getVar('imgcat_id')) {
- $sel = ' selected="selected"';
+ echo '</td>';
+
+ echo '<td class="head">'._IMAGENAME,'</td><td class="even">';
+ if ($imgcat_write) {
+ echo '<input type="hidden" name="image_id[]" value="'.$i.'" /><input type="text" name="image_nicename[]" value="'.$images[$i]->getVar('image_nicename', 'E').'" size="20" maxlength="255" />';
+ } else {
+ echo '<b>' . $images[$i]->getVar('image_nicename') . '</b>';
+ }
+ echo '</td></tr>';
+
+ echo '<tr><td class="head">'._IMAGEMIME.'</td><td class="odd">'.$images[$i]->getVar('image_mimetype').'</td></tr>';
+
+ if ($imgcat_write) {
+ echo '<tr><td class="head">'._IMAGECAT.'</td><td class="even">';
+ echo '<select name="imgcat_id[]" size="1">';
+ $list =& $imgcat_handler->getList($groups, 'imgcat_write', null, $imagecategory->getVar('imgcat_storetype'));
+ foreach ($list as $value => $name) {
+ $sel = '';
+ if ($value == $images[$i]->getVar('imgcat_id')) {
+ $sel = ' selected="selected"';
+ }
+ echo '<option value="'.$value.'"'.$sel.'>'.$name.'</option>';
}
- echo '<option value="'.$value.'"'.$sel.'>'.$name.'</option>';
+ echo '</select></td></tr>';
+
+ echo '<tr><td class="head">'._IMGWEIGHT.'</td><td class="odd"><input type="text" name="image_weight[]" value="'.$images[$i]->getVar('image_weight').'" size="3" maxlength="4" /></td></tr>';
+ echo '<tr><td class="head">'._IMGDISPLAY.'</td><td class="even"><input type="checkbox" name="image_display[]" value="1"';
+ if ($images[$i]->getVar('image_display') == 1) {
+ echo ' checked="checked"';
+ }
+ echo ' /></td></tr>';
}
- echo '</select></td></tr><tr><td class="head">'._IMGWEIGHT.'</td><td class="odd"><input type="text" name="image_weight[]" value="'.$images[$i]->getVar('image_weight').'" size="3" maxlength="4" /></td></tr><tr><td class="head">'._IMGDISPLAY.'</td><td class="even"><input type="checkbox" name="image_display[]" value="1"';
- if ($images[$i]->getVar('image_display') == 1) {
- echo ' checked="checked"';
+ if (in_array(XOOPS_GROUP_ADMIN, $groups)) {
+ echo '<tr><td class="head"> </td><td class="odd"><a href="admin.php?fct=images&op=delfile&image_id='.$i.'">'._DELETE.'</a></td></tr>';
}
- echo ' /></td></tr><tr><td class="head"> </td><td class="odd"><a href="admin.php?fct=images&op=delfile&image_id='.$i.'">'._DELETE.'</a></td></tr></table><br />';
+ echo '</table><br />';
}
if ($imgcount > 0) {
if ($imgcount > 20) {
@@ -148,7 +218,9 @@
$nav = new XoopsPageNav($imgcount, 20, $start, 'start', 'fct=images&op=listimg&imgcat_id='.$imgcat_id);
echo '<div text-align="right">'.$nav->renderNav().'</div>';
}
- echo '<div style="text-align:center;"><input type="hidden" name="op" value="save" /><input type="hidden" name="fct" value="images" />'.$GLOBALS['xoopsSecurity']->getTokenHTML().'<input type="submit" name="submit" value="'._SUBMIT.'" /></div></form>';
+ if ($imgcat_write) {
+ echo '<div style="text-align:center;"><input type="hidden" name="op" value="save" /><input type="hidden" name="fct" value="images" />'.$GLOBALS['xoopsSecurity']->getTokenHTML().'<input type="submit" name="submit" value="'._SUBMIT.'" /></div></form>';
+ }
}
xoops_cp_footer();
exit();
@@ -445,7 +517,7 @@
exit();
}
$image_handler =& xoops_gethandler('image');
- $images =& $image_handler->getObjects(new Criteria('imgcat_id', $imgcat_id), true, false);
+ $images = $image_handler->getObjects(new Criteria('imgcat_id', $imgcat_id), true, false);
$errors = array();
foreach (array_keys($images) as $i) {
if (!$image_handler->delete($images[$i])) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ph...@us...> - 2008-07-27 03:05:29
|
Revision: 1905
http://xoops.svn.sourceforge.net/xoops/?rev=1905&view=rev
Author: phppp
Date: 2008-07-27 03:05:37 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
Created 2.0.18.2 branch from 2.0.18.1 plus two commits by beckmi
Added Paths:
-----------
XoopsCore/branches/2.0.x/2.0.18.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.