[ros-diffs] [cfinck] 40186: - Start customizing some subsystems for RosCMS 4 and our new Backend server --> Bugzilla: Customized to the new config file path --> Shared: Fully customized --> Testman: Fully customized, ready for a test installation now :-) --> Wiki: Customized to the new config file path - Upgrade the MediaWiki config file to our used MediaWiki version - Remove the old ReactOS logo shown in case of a Wiki error, add a refreshed one - Add config file examples to the directories, which are also used by the server, to make local testing easier
cfinck at svn.reactos.org
cfinck at svn.reactos.org
Mon Mar 23 18:09:42 CET 2009
Author: cfinck
Date: Mon Mar 23 20:09:41 2009
New Revision: 40186
URL: http://svn.reactos.org/svn/reactos?rev=40186&view=rev
Log:
- Start customizing some subsystems for RosCMS 4 and our new Backend server
--> Bugzilla: Customized to the new config file path
--> Shared: Fully customized
--> Testman: Fully customized, ready for a test installation now :-)
--> Wiki: Customized to the new config file path
- Upgrade the MediaWiki config file to our used MediaWiki version
- Remove the old ReactOS logo shown in case of a Wiki error, add a refreshed one
- Add config file examples to the directories, which are also used by the server, to make local testing easier
Added:
branches/danny-web/reactos.org/htdocs/testman/connect.db.php (with props)
branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php (with props)
branches/danny-web/reactos.org/www.reactos.org_config/ (with props)
branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config (with props)
branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php (with props)
branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php (with props)
Removed:
branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/reactos.png
branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php
Modified:
branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm
branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php
branches/danny-web/reactos.org/htdocs/testman/ajax-search.php
branches/danny-web/reactos.org/htdocs/testman/compare.php
branches/danny-web/reactos.org/htdocs/testman/config.inc.php
branches/danny-web/reactos.org/htdocs/testman/detail.php
branches/danny-web/reactos.org/htdocs/testman/index.php
branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php
branches/danny-web/reactos.org/htdocs/testman/webservice/index.php
branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php
branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php
branches/danny-web/reactos.org/htdocs/wiki/config/index.php
branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/wiki.png
Modified: branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -417,7 +417,7 @@
}
# The "localconfig" file has another path on the ReactOS Web Server
- $localconfig = "../../config/bugzilla-config";
+ $localconfig = "../../www.reactos.org_config/bugzilla-config";
# We have to return absolute paths for mod_perl.
# That means that if you modify these paths, they must be absolute paths.
Modified: branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -6,7 +6,7 @@
COPYRIGHT: Copyright 2008-2009 Colin Finck <colin at reactos.org>
*/
- require_once(ROOT_PATH . "roscms/inc/utils.php");
+ require_once(ROSCMS_PATH . "inc/utils.php");
function GetLanguage()
{
Modified: branches/danny-web/reactos.org/htdocs/testman/ajax-search.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/ajax-search.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -13,6 +13,7 @@
require_once("config.inc.php");
+ require_once("connect.db.php");
require_once("utils.inc.php");
try
@@ -40,15 +41,15 @@
$where .= "AND r.id >= " . (int)$_GET["startid"] . " ";
if($_GET["user"])
- $where .= "AND u.user_name LIKE " . $dbh->quote($_GET["user"] . "%") . " ";
+ $where .= "AND a.name LIKE " . $dbh->quote($_GET["user"] . "%") . " ";
if($_GET["platform"])
$where .= "AND r.platform LIKE " . $dbh->quote($_GET["platform"] . "%") . " ";
}
// Prepare some clauses
- $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id ";
- $order = "ORDER BY revision ASC, id ASC ";
+ $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id ";
+ $order = "ORDER BY revision ASC, r.id ASC ";
echo "<results>";
@@ -81,7 +82,7 @@
if($_GET["resultlist"])
{
$stmt = $dbh->query(
- "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " .
+ "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " .
$tables . $where . $order .
"LIMIT " . RESULTS_PER_PAGE
) or die("<error>Query failed #2</error>");
@@ -100,7 +101,7 @@
echo "<result>";
printf("<id>%d</id>", $row["id"]);
printf("<date>%s</date>", GetDateString($row["timestamp"]));
- printf("<user>%s</user>", htmlspecialchars($row["user_name"]));
+ printf("<user>%s</user>", htmlspecialchars($row["name"]));
printf("<revision>%d</revision>", $row["revision"]);
printf("<platform>%s</platform>", GetPlatformString($row["platform"]));
printf("<comment>%s</comment>", htmlspecialchars($row["comment"]));
Modified: branches/danny-web/reactos.org/htdocs/testman/compare.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/compare.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/compare.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -8,12 +8,11 @@
charset=utf-8 without BOM
*/
- define("ROOT_PATH", "../");
-
require_once("config.inc.php");
+ require_once("connect.db.php");
require_once("utils.inc.php");
require_once("languages.inc.php");
- require_once(ROOT_PATH . "shared/subsys_layout.php");
+ require_once(SHARED_PATH . "subsys_layout.php");
GetLanguage();
require_once("lang/$lang.inc.php");
@@ -166,10 +165,10 @@
printf('<th class="TestSuite">%s</th>', $testman_langres["testsuite"]);
$stmt = $dbh->prepare(
- "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " .
+ "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform " .
"FROM " . DB_TESTMAN . ".winetest_runs r " .
- "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " .
- "WHERE r.id = :id"
+ "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " .
+ "WHERE r.id = :id"
);
foreach($id_array as $id)
@@ -179,7 +178,7 @@
$row = $stmt->fetch(PDO::FETCH_ASSOC);
echo '<th onmousedown="ResultHead_OnMouseDown(this)">';
- printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["user_name"], GetPlatformString($row["platform"]));
+ printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["name"], GetPlatformString($row["platform"]));
echo '</th>';
}
Modified: branches/danny-web/reactos.org/htdocs/testman/config.inc.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/config.inc.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/config.inc.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/config.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -2,20 +2,13 @@
/*
PROJECT: ReactOS Web Test Manager
LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation
- PURPOSE: Configuration settings
+ PURPOSE: Configuration settings for the Web Interface
COPYRIGHT: Copyright 2008-2009 Colin Finck <colin at reactos.org>
*/
-
- // DB Settings
- // The user entered here must have:
- // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_TESTMAN
- // * SELECT privileges to $DB_ROSCMS
- define("DB_HOST", "localhost");
- define("DB_USER", "root");
- define("DB_PASS", "");
-
- define("DB_ROSCMS", "roscms");
- define("DB_TESTMAN", "testman");
+
+ define("ROSCMS_PATH", "../roscms/");
+ define("SHARED_PATH", "../shared/");
+ define("TESTMAN_PATH", "");
define("RESULTS_PER_PAGE", 100);
define("MAX_COMPARE_RESULTS", 5);
Added: branches/danny-web/reactos.org/htdocs/testman/connect.db.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/connect.db.php?rev=40186&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/connect.db.php (added)
+++ branches/danny-web/reactos.org/htdocs/testman/connect.db.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -1,0 +1,10 @@
+<?php
+/*
+ PROJECT: ReactOS Web Test Manager
+ LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation
+ PURPOSE: Database Configuration Settings
+ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin at reactos.org>
+*/
+
+ require_once(TESTMAN_PATH . "../../www.reactos.org_config/testman-connect.php");
+?>
Propchange: branches/danny-web/reactos.org/htdocs/testman/connect.db.php
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/danny-web/reactos.org/htdocs/testman/detail.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/detail.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/detail.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/detail.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -7,13 +7,12 @@
charset=utf-8 without BOM
*/
-
- define("ROOT_PATH", "../");
require_once("config.inc.php");
+ require_once("connect.db.php");
require_once("utils.inc.php");
require_once("languages.inc.php");
- require_once(ROOT_PATH . "shared/subsys_layout.php");
+ require_once(SHARED_PATH . "subsys_layout.php");
GetLanguage();
require_once("lang/$lang.inc.php");
@@ -53,11 +52,11 @@
// Get information about this result
$stmt = $dbh->prepare(
- "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, u.user_name, r.comment " .
+ "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " .
"FROM " . DB_TESTMAN . ".winetest_results e " .
"JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " .
"JOIN " . DB_TESTMAN . ".winetest_runs r ON e.test_id = r.id " .
- "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " .
+ "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " .
"WHERE e.id = :id"
);
$stmt->bindParam(":id", $_GET["id"]);
@@ -111,7 +110,7 @@
</tr>
<tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)">
<td class="info"><?php echo $testman_langres["user"]; ?>:</td>
- <td><?php echo $row["user_name"]; ?></td>
+ <td><?php echo $row["name"]; ?></td>
</tr>
<tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)">
<td class="info"><?php echo $testman_langres["platform"]; ?>:</td>
Modified: branches/danny-web/reactos.org/htdocs/testman/index.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/index.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/index.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -7,17 +7,16 @@
charset=utf-8 without BOM
*/
-
- define("ROOT_PATH", "../");
require_once("config.inc.php");
+ require_once("connect.db.php");
require_once("utils.inc.php");
require_once("languages.inc.php");
- require_once(ROOT_PATH . "shared/subsys_layout.php");
- require_once(ROOT_PATH . "shared/svn.php");
+ require_once(SHARED_PATH . "subsys_layout.php");
+ require_once(SHARED_PATH . "svn.php");
GetLanguage();
- require_once(ROOT_PATH . "shared/lang/$lang.inc.php");
+ require_once(SHARED_PATH . "lang/$lang.inc.php");
require_once("lang/$lang.inc.php");
$rev = GetLatestRevision();
@@ -113,10 +112,10 @@
}
$stmt = $dbh->query(
- "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " .
+ "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " .
"FROM " . DB_TESTMAN . ".winetest_runs r " .
- "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " .
- "ORDER BY revision DESC, id DESC " .
+ "JOIN " . DB_ROSCMS . ".roscms_accounts a ON r.user_id = a.id " .
+ "ORDER BY revision DESC, r.id DESC " .
"LIMIT 10"
) or die("Query failed #1");
@@ -131,7 +130,7 @@
printf('<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_%s" /></td>', $row["id"]);
printf('<td onclick="Result_OnCellClick(this)">%s</td>', $row["revision"]);
printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetDateString($row["timestamp"]));
- printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["user_name"]));
+ printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["name"]));
printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetPlatformString($row["platform"]));
printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["comment"]));
echo "</tr>";
Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -5,8 +5,9 @@
PURPOSE: Aggregator for the Debug Log of ReactOS BuildBot Buildslaves
COPYRIGHT: Copyright 2009 Colin Finck <colin at reactos.org>
*/
-
- require_once("../config.inc.php");
+
+ require_once("config.inc.php");
+ require_once(TESTMAN_PATH . "connect.db.php");
require_once("utils.inc.php");
if(!isset($_GET["username"]) || !isset($_GET["password"]) || !isset($_GET["slavename"]) || !is_numeric($_GET["platform"]) || !is_numeric($_GET["build"]))
Added: branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php?rev=40186&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php (added)
+++ branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -1,0 +1,10 @@
+<?php
+/*
+ PROJECT: ReactOS Web Test Manager
+ LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation
+ PURPOSE: Configuration settings for the Web Service
+ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin at reactos.org>
+*/
+
+ define("TESTMAN_PATH", "../");
+?>
Propchange: branches/danny-web/reactos.org/htdocs/testman/webservice/config.inc.php
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/index.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/webservice/index.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -6,7 +6,8 @@
COPYRIGHT: Copyright 2008-2009 Colin Finck <colin at reactos.org>
*/
- require_once("../config.inc.php");
+ require_once("config.inc.php");
+ require_once(TESTMAN_PATH . "connect.db.php");
require_once("utils.inc.php");
if(!isset($_POST["username"]) || !isset($_POST["password"]) || !isset($_POST["testtype"]))
Modified: branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/testman/webservice/utils.inc.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -26,7 +26,7 @@
global $dbh;
// Check the login credentials
- $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = MD5(:password) AND user_account_enabled = 'yes'");
+ $stmt = $dbh->prepare("SELECT id FROM " . DB_ROSCMS . ".roscms_accounts WHERE name = :username AND password = MD5(:password) AND disabled = 0");
$stmt->bindParam(":username", $username);
$stmt->bindParam(":password", $password);
$stmt->execute() or die("SQL failed #1");
Modified: branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/wiki/LocalSettings.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -7,6 +7,9 @@
# See includes/DefaultSettings.php for all configurable settings
# and their default values, but don't forget to make changes in _this_
# file, not there.
+#
+# Further documentation for configuration settings may be found at:
+# http://www.mediawiki.org/wiki/Manual:Configuration_settings
# If you customize your file layout, set $IP to the directory that contains
# the other MediaWiki files. It will be used as a base to locate files.
@@ -19,7 +22,7 @@
$path = array( $IP, "$IP/includes", "$IP/languages" );
set_include_path( implode( PATH_SEPARATOR, $path ) . PATH_SEPARATOR . get_include_path() );
-require_once( "includes/DefaultSettings.php" );
+require_once( "$IP/includes/DefaultSettings.php" );
# If PHP's memory limit is very low, some operations may fail.
# ini_set( 'memory_limit', '20M' );
@@ -28,65 +31,59 @@
if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
die( "This script must be run from the command line\n" );
}
-} elseif ( empty( $wgNoOutputBuffer ) ) {
- ## Compress output if the browser supports it
- if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' );
}
+## Uncomment this to disable output compression
+# $wgDisableOutputCompression = true;
$wgSitename = "ReactOS";
-$wgScriptPath = "/wiki";
-$wgScript = "$wgScriptPath/index.php";
-$wgRedirectScript = "$wgScriptPath/redirect.php";
+## The URL base path to the directory containing the wiki;
+## defaults for all runtime URL paths are based off of this.
+## For more information on customizing the URLs please see:
+## http://www.mediawiki.org/wiki/Manual:Short_URL
+$wgScriptPath = "/wiki";
+$wgScriptExtension = ".php";
-## For more information on customizing the URLs please see:
-## http://meta.wikimedia.org/wiki/Eliminating_index.php_from_the_url
-## If using PHP as a CGI module, the ?title= style usually must be used.
-$wgArticlePath = "$wgScript/$1";
-# $wgArticlePath = "$wgScript?title=$1";
+$wgArticlePath = "$wgScriptPath/$1";
+$wgStylePath = "$wgScriptPath/skins";
-$wgStylePath = "$wgScriptPath/skins";
-$wgStyleDirectory = "$IP/skins";
-$wgLogo = "$wgStylePath/common/images/reactos.png";
+## UPO means: this is also a user preference option
-$wgUploadPath = "$wgScriptPath/images";
-$wgUploadDirectory = "$IP/images";
-
-$wgEnableEmail = true;
-$wgEnableUserEmail = true;
+$wgEnableEmail = true;
+$wgEnableUserEmail = true; # UPO
$wgEmergencyContact = "ros-web at reactos.org";
-$wgPasswordSender = "ros-web at reactos.org";
+$wgPasswordSender = "ros-web at reactos.org";
-## For a detailed description of the following switches see
-## http://meta.wikimedia.org/Enotif and http://meta.wikimedia.org/Eauthent
-## There are many more options for fine tuning available see
-## /includes/DefaultSettings.php
-## UPO means: this is also a user preference option
$wgEnotifUserTalk = true; # UPO
$wgEnotifWatchlist = true; # UPO
$wgEmailAuthentication = false;
-# Uncomment one of the following lines based on whether the Wiki runs on the ReactOS Server or locally
-require_once("/web/reactos.org/config/wiki-connect.php");
-//require_once("$IP/wiki-connect.php");
+require_once("$IP/../../www.reactos.org_config/wiki-connect.php");
-# Use the hash preprocessor for our server
-$wgParserConf["preprocessorClass"] = "Preprocessor_Hash";
+# MySQL specific settings
+$wgDBprefix = "";
+
+# MySQL table options to use during installation or update
+$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
# Experimental charset support for MySQL 4.1/5.0.
-$wgDBmysql5 = false;
+$wgDBmysql5 = true;
## Shared memory settings
$wgMainCacheType = CACHE_NONE;
$wgMemCachedServers = array();
## To enable image uploads, make sure the 'images' directory
-## is writable, then uncomment this:
-$wgEnableUploads = true;
-$wgUseImageResize = true;
+## is writable, then set this to true:
+$wgEnableUploads = true;
$wgUseImageMagick = true;
$wgImageMagickConvertCommand = "/usr/bin/convert";
+
+## If you use ImageMagick (or any other shell command) on a
+## Linux server, this will need to be set to the name of an
+## available UTF-8 locale
+$wgShellLocale = "en_US.UTF-8";
## If you want to use image uploads under safe mode,
## create the directories images/archive, images/thumb and
@@ -96,10 +93,7 @@
## If you have the appropriate support software installed
## you can enable inline LaTeX equations:
-# $wgUseTeX = true;
-$wgMathPath = "{$wgUploadPath}/math";
-$wgMathDirectory = "{$wgUploadDirectory}/math";
-$wgTmpDirectory = "{$wgUploadDirectory}/tmp";
+$wgUseTeX = false;
$wgLocalInterwiki = $wgSitename;
@@ -114,7 +108,7 @@
## For attaching licensing metadata to pages, and displaying an
## appropriate copyright notice / icon. GNU Free Documentation
## License and Creative Commons licenses are supported so far.
-$wgEnableCreativeCommonsRdf = true;
+# $wgEnableCreativeCommonsRdf = true;
$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
$wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html";
$wgRightsText = "GNU Free Documentation License 1.2";
@@ -125,8 +119,7 @@
# When you make changes to this configuration file, this will make
# sure that cached pages are cleared.
-$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) );
-$wgCacheEpoch = max( $wgCacheEpoch, $configdate );
+$wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );
# Entirely disable Anonymous Edits
$wgGroupPermissions['*']['edit'] = false;
@@ -142,9 +135,6 @@
$wgGroupPermissions['supermod']['undelete'] = true;
$wgGroupPermissions['supermod']['rollback'] = true;
-# deactivate DB SQL queries
-$wgAllowSysopQueries = false;
-
# Enable external image embedding
$wgAllowExternalImages = true;
@@ -153,5 +143,3 @@
# RosCMS-specific settings
define("ROSCMS_PATH", "$IP/../roscms/");
-
-?>
Modified: branches/danny-web/reactos.org/htdocs/wiki/config/index.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wiki/config/index.php?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/wiki/config/index.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/wiki/config/index.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -22,6 +22,8 @@
error_reporting( E_ALL );
header( "Content-type: text/html; charset=utf-8" );
@ini_set( "display_errors", true );
+
+define("ROSCMS_PATH", "../../roscms/");
# In case of errors, let output be clean.
$wgRequestTime = microtime( true );
Removed: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/reactos.png
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/reactos.png?rev=40185&view=auto
==============================================================================
Binary file - no diff available.
Modified: branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/wiki.png
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wiki/skins/common/images/wiki.png?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
Binary files - no diff available.
Removed: branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php?rev=40185&view=auto
==============================================================================
--- branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/wiki/wiki-connect.php (removed)
@@ -1,10 +1,0 @@
-<?php
- // Settings for a local MediaWiki installation
- $wgDBserver = "localhost";
- $wgDBname = "wiki";
- $wgDBuser = "rosuser";
- $wgDBpassword = "roscms";
- $wgDBprefix = "";
- $wgDBtype = "mysql";
- $wgDBport = "5432";
-?>
Propchange: branches/danny-web/reactos.org/www.reactos.org_config/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Mar 23 20:09:41 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: branches/danny-web/reactos.org/www.reactos.org_config/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: branches/danny-web/reactos.org/www.reactos.org_config/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Added: branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config?rev=40186&view=auto
==============================================================================
--- branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config (added)
+++ branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -1,0 +1,90 @@
+
+# If you are using Apache as your web server, Bugzilla can create .htaccess
+# files for you that will instruct Apache not to serve files that shouldn't
+# be accessed from the web (like your local configuration data and non-cgi
+# executable files). For this to work, the directory your Bugzilla
+# installation is in must be within the jurisdiction of a <Directory> block
+# in the httpd.conf file that has 'AllowOverride Limit' in it. If it has
+# 'AllowOverride All' or other options with Limit, that's fine.
+# (Older Apache installations may use an access.conf file to store these
+# <Directory> blocks.)
+# If this is set to 1, Bugzilla will create these files if they don't exist.
+# If this is set to 0, Bugzilla will not create these files.
+$create_htaccess = 1;
+
+# This is the group your web server runs as.
+# If you have a Windows box, ignore this setting.
+# If you do not have access to the group your web server runs under,
+# set this to "". If you do set this to "", then your Bugzilla installation
+# will be _VERY_ insecure, because some files will be world readable/writable,
+# and so anyone who can get local access to your machine can do whatever they
+# want. You should only have this set to "" if this is a testing installation
+# and you cannot set this up any other way. YOU HAVE BEEN WARNED!
+# If you set this to anything other than "", you will need to run checksetup.pl
+# asAdministrator, or as a user who is a member of the specified group.
+$webservergroup = '';
+
+# What SQL database to use. Default is mysql. List of supported databases
+# can be obtained by listing Bugzilla/DB directory - every module corresponds
+# to one supported database and the name corresponds to a driver name.
+$db_driver = 'mysql';
+
+# The DNS name of the host that the database server runs on.
+$db_host = 'localhost';
+
+# The name of the database
+$db_name = 'bugs';
+
+# Who we connect to the database as.
+$db_user = 'root';
+
+# Enter your database password here. It's normally advisable to specify
+# a password for your bugzilla database user.
+# If you use apostrophe (') or a backslash (\) in your password, you'll
+# need to escape it by preceding it with a '\' character. (\') or (\)
+# (Far simpler just not to use those characters.)
+$db_pass = '';
+
+# Sometimes the database server is running on a non-standard port. If that's
+# the case for your database server, set this to the port number that your
+# database server is running on. Setting this to 0 means "use the default
+# port for my database server."
+$db_port = 0;
+
+# MySQL Only: Enter a path to the unix socket for MySQL. If this is
+# blank, then MySQL's compiled-in default will be used. You probably
+# want that.
+$db_sock = '';
+
+# Should checksetup.pl try to verify that your database setup is correct?
+# (with some combinations of database servers/Perl modules/moonphase this
+# doesn't work)
+$db_check = 1;
+
+# With the introduction of a configurable index page using the
+# template toolkit, Bugzilla's main index page is now index.cgi.
+# Most web servers will allow you to use index.cgi as a directory
+# index, and many come preconfigured that way, but if yours doesn't
+# then you'll need an index.html file that provides redirection
+# to index.cgi. Setting $index_html to 1 below will allow
+# checksetup.pl to create one for you if it doesn't exist.
+# NOTE: checksetup.pl will not replace an existing file, so if you
+# wish to have checksetup.pl create one for you, you must
+# make sure that index.html doesn't already exist
+$index_html = 0;
+
+# For some optional functions of Bugzilla (such as the pretty-print patch
+# viewer), we need the cvs binary to access files and revisions.
+# Because it's possible that this program is not in your path, you can specify
+# its location here. Please specify the full path to the executable.
+$cvsbin = '';
+
+# For some optional functions of Bugzilla (such as the pretty-print patch
+# viewer), we need the interdiff binary to make diffs between two patches.
+# Because it's possible that this program is not in your path, you can specify
+# its location here. Please specify the full path to the executable.
+$interdiffbin = '';
+
+# The interdiff feature needs diff, so we have to have that path.
+# Please specify the directory name only; do not use trailing slash.
+$diffpath = '';
Propchange: branches/danny-web/reactos.org/www.reactos.org_config/bugzilla-config
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php?rev=40186&view=auto
==============================================================================
--- branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php (added)
+++ branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -1,0 +1,12 @@
+<?php
+ // DB Settings
+ // The user entered here must have:
+ // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_TESTMAN
+ // * SELECT privileges to $DB_ROSCMS
+ define("DB_HOST", "localhost");
+ define("DB_USER", "root");
+ define("DB_PASS", "");
+
+ define("DB_ROSCMS", "roscms");
+ define("DB_TESTMAN", "testman");
+?>
Propchange: branches/danny-web/reactos.org/www.reactos.org_config/testman-connect.php
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php?rev=40186&view=auto
==============================================================================
--- branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php (added)
+++ branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php [iso-8859-1] Mon Mar 23 20:09:41 2009
@@ -1,0 +1,7 @@
+<?php
+ // Settings for a local MediaWiki installation
+ $wgDBserver = "localhost";
+ $wgDBname = "wiki";
+ $wgDBuser = "root";
+ $wgDBpassword = "";
+?>
Propchange: branches/danny-web/reactos.org/www.reactos.org_config/wiki-connect.php
------------------------------------------------------------------------------
svn:eol-style = native
More information about the Ros-diffs
mailing list