X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=blobdiff_plain;f=includes%2FSeleniumWebSettings.php;h=0e4decfbe2d468afab4132fe467afc0d432f7882;hb=4477e5dbac5764af4b40d338e58f2975e34bd159;hp=7a838e9a7a66b9ac480294db28f7d4a616581c4c;hpb=935f67b7f1e433793fdcf4f4a66ab4a1c309afc8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SeleniumWebSettings.php b/includes/SeleniumWebSettings.php
index 7a838e9a7a..0e4decfbe2 100644
--- a/includes/SeleniumWebSettings.php
+++ b/includes/SeleniumWebSettings.php
@@ -1,9 +1,28 @@
 <?php
-/*
+/**
  * Dynamically change configuration variables based on the test suite name and a cookie value.
+ *
  * For details on how to configure a wiki for a Selenium test, see:
  * http://www.mediawiki.org/wiki/SeleniumFramework#Test_Wiki_configuration
+ *
+ * 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.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
  */
+
 if ( !defined( 'MEDIAWIKI' ) ) {
 	die( 1 );
 }
@@ -13,90 +32,99 @@ require_once( "$IP/includes/GlobalFunctions.php" );
 $fname = 'SeleniumWebSettings.php';
 wfProfileIn( $fname );
 
-$cookiePrefix = $wgSitename . "-";
-$cookieName = $cookiePrefix . "Selenium";
+$cookiePrefix = $wgSitename . '-';
+$cookieName = $cookiePrefix . 'Selenium';
 
-// this is a fallback sql file
+// this is a fallback SQL file
 $testSqlFile = false;
 $testImageZip = false;
-	
-//if we find a request parameter containing the test name, set a cookie with the test name
+
+// if we find a request parameter containing the test name, set a cookie with the test name
 if ( isset( $_GET['setupTestSuite'] ) ) {
 	$setupTestSuiteName = $_GET['setupTestSuite'];
 
-	if ( preg_match( '/[^a-zA-Z0-9_-]/', $setupTestSuiteName ) || !isset( $wgSeleniumTestConfigs[$setupTestSuiteName] ) ) {
+	if (
+		preg_match( '/[^a-zA-Z0-9_-]/', $setupTestSuiteName ) ||
+		!isset( $wgSeleniumTestConfigs[$setupTestSuiteName] )
+	)
+	{
 		return;
 	}
-	if ( strlen( $setupTestSuiteName) > 0 ) {
+	if ( strlen( $setupTestSuiteName ) > 0 ) {
 		$expire = time() + 600;
-		setcookie( $cookieName,
+		setcookie(
+			$cookieName,
 			$setupTestSuiteName,
 			$expire,
 			$wgCookiePath,
 			$wgCookieDomain,
 			$wgCookieSecure,
-			true );
+			true
+		);
 	}
-	
-	$testIncludes = array(); //array containing all the includes needed for this test
-	$testGlobalConfigs = array(); //an array containg all the global configs needed for this test
+
+	$testIncludes = array(); // array containing all the includes needed for this test
+	$testGlobalConfigs = array(); // an array containg all the global configs needed for this test
 	$testResourceFiles = array(); // an array containing all the resource files needed for this test
 	$callback = $wgSeleniumTestConfigs[$setupTestSuiteName];
 	call_user_func_array( $callback, array( &$testIncludes, &$testGlobalConfigs, &$testResourceFiles));
-	
-	if ( isset( $testResourceFiles['db'] ) ) {
-		$testSqlFile = $testResourceFiles['db'];
-	}
-	if ( isset($testResourceFiles['images']) ) {
+
+	if ( isset( $testResourceFiles['images'] ) ) {
 		$testImageZip = $testResourceFiles['images'];
 	}
 
-	$testResourceName = getTestResourceNameFromTestSuiteName( $setupTestSuiteName );
-	switchToTestResources( $testResourceName, false ); // false means do not switch database yet
-	setupTestResources( $testResourceName, $testSqlFile, $testImageZip );
+	if ( isset( $testResourceFiles['db'] ) ) {
+		$testSqlFile = $testResourceFiles['db'];
+		$testResourceName = getTestResourceNameFromTestSuiteName( $setupTestSuiteName );
+
+		switchToTestResources( $testResourceName, false ); // false means do not switch database yet
+		setupTestResources( $testResourceName, $testSqlFile, $testImageZip );
+	}
 }
 
-//clear the cookie based on a request param
+// clear the cookie based on a request param
 if ( isset( $_GET['clearTestSuite'] ) ) {
 	$testSuiteName = getTestSuiteNameFromCookie( $cookieName );
 
-	$expire = time() - 600; 
-	setcookie( $cookieName,
+	$expire = time() - 600;
+	setcookie(
+		$cookieName,
 		'',
 		$expire,
 		$wgCookiePath,
 		$wgCookieDomain,
 		$wgCookieSecure,
-		true );
-	
+		true
+	);
+
 	$testResourceName = getTestResourceNameFromTestSuiteName( $testSuiteName );
 	teardownTestResources( $testResourceName );
 }
 
-//if a cookie is found, run the appropriate callback to get the config params.
-if ( isset( $_COOKIE[$cookieName] ) ) {		
+// if a cookie is found, run the appropriate callback to get the config params.
+if ( isset( $_COOKIE[$cookieName] ) ) {
 	$testSuiteName = getTestSuiteNameFromCookie( $cookieName );
 	if ( !isset( $wgSeleniumTestConfigs[$testSuiteName] ) ) {
 		return;
 	}
-	
-	$testResourceName = getTestResourceNameFromTestSuiteName( $testSuiteName );
-	switchToTestResources( $testResourceName );
-	
-	$testIncludes = array(); //array containing all the includes needed for this test
-	$testGlobalConfigs = array(); //an array containg all the global configs needed for this test
+
+	$testIncludes = array(); // array containing all the includes needed for this test
+	$testGlobalConfigs = array(); // an array containg all the global configs needed for this test
 	$testResourceFiles = array(); // an array containing all the resource files needed for this test
-	$callback = $wgSeleniumTestConfigs[$testSuiteName]; 
+	$callback = $wgSeleniumTestConfigs[$testSuiteName];
 	call_user_func_array( $callback, array( &$testIncludes, &$testGlobalConfigs, &$testResourceFiles));
-      
+
+	if ( isset( $testResourceFiles['db'] ) ) {
+		$testResourceName = getTestResourceNameFromTestSuiteName( $testSuiteName );
+		switchToTestResources( $testResourceName );
+	}
 	foreach ( $testIncludes as $includeFile ) {
 		$file = $IP . '/' . $includeFile;
 		require_once( $file );
 	}
 	foreach ( $testGlobalConfigs as $key => $value ) {
-		if ( is_array( $value ) ) {		
+		if ( is_array( $value ) ) {
 			$GLOBALS[$key] = array_merge( $GLOBALS[$key], $value );
-			
 		} else {
 			$GLOBALS[$key] = $value;
 		}
@@ -128,28 +156,25 @@ function getTestUploadPathFromResourceName( $testResourceName ) {
 }
 
 function setupTestResources( $testResourceName, $testSqlFile, $testImageZip ) {
-	global $wgDBname, $wgSeleniumUseTestResources;
-	
-	if ( !$wgSeleniumUseTestResources ) {
-		return false;
-	}
+	global $wgDBname;
+
 	// Basic security. Do not allow to drop productive database.
-	if ( $testResouceName == $wgDBname ) {
-		die( "Cannot override productive database." );
+	if ( $testResourceName == $wgDBname ) {
+		die( 'Cannot override productive database.' );
 	}
 	if ( $testResourceName == '' ) {
-		die( "Cannot identify a test the resources should be installed for." );
+		die( 'Cannot identify a test the resources should be installed for.' );
 	}
-	
-	//create tables
-	$dbw =& wfGetDB( DB_MASTER );
-	$dbw->query( "DROP DATABASE IF EXISTS ".$testResourceName );
-	$dbw->query( "CREATE DATABASE ".$testResourceName );
 
-	// do not set the new db name before database is setup
+	// create tables
+	$dbw = wfGetDB( DB_MASTER );
+	$dbw->query( 'DROP DATABASE IF EXISTS ' . $testResourceName );
+	$dbw->query( 'CREATE DATABASE ' . $testResourceName );
+
+	// do not set the new DB name before database is setup
 	$wgDBname = $testResourceName;
 	$dbw->selectDB( $testResourceName );
-	// populate from sql file
+	// populate from SQL file
 	if ( $testSqlFile ) {
 		$dbw->sourceFile( $testSqlFile );
 	}
@@ -169,14 +194,9 @@ function setupTestResources( $testResourceName, $testSqlFile, $testImageZip ) {
 }
 
 function teardownTestResources( $testResourceName ) {
-	global $wgSeleniumUseTestResources;
-	
-	if ( !$wgSeleniumUseTestResources ) {
-		return false;
-	}
 	// remove test database
-	$dbw =& wfGetDB( DB_MASTER );
-	$dbw->query( "DROP DATABASE IF EXISTS ".$testResourceName );
+	$dbw = wfGetDB( DB_MASTER );
+	$dbw->query( 'DROP DATABASE IF EXISTS ' . $testResourceName );
 
 	$testUploadPath = getTestUploadPathFromResourceName( $testResourceName );
 	// remove test image dir
@@ -186,40 +206,16 @@ function teardownTestResources( $testResourceName ) {
 }
 
 function switchToTestResources( $testResourceName, $switchDB = true ) {
-	global $wgDBuser, $wgDBpassword, $wgDBname, $wgDBprefix;
-	global $wgDBtestuser, $wgDBtestpassword, $wgDBtestprefix;
+	global $wgDBuser, $wgDBpassword, $wgDBname;
+	global $wgDBtestuser, $wgDBtestpassword;
 	global $wgUploadPath;
-	global $wgSeleniumUseTestResources;
-	
-	if ( !$wgSeleniumUseTestResources ) {
-		return false;
-	}
 
 	if ( $switchDB ) {
 		$wgDBname = $testResourceName;
 	}
 	$wgDBuser = $wgDBtestuser;
 	$wgDBpassword = $wgDBtestpassword;
-	//$wgDBprefix = $wgDBtestprefix;	
 
-	$testUploadPath =  getTestUploadPathFromResourceName( $testResourceName );
+	$testUploadPath = getTestUploadPathFromResourceName( $testResourceName );
 	$wgUploadPath = $testUploadPath;
 }
-
-function wfRecursiveRemoveDir( $dir ) {
-	// taken from http://de3.php.net/manual/en/function.rmdir.php#98622
-	if ( is_dir( $dir ) ) {
-		$objects = scandir( $dir );
-		foreach ( $objects as $object ) {
-			if ( $object != "." && $object != ".." ) {
-				if ( filetype( $dir."/".$object ) == "dir" ) {
-					wfRecursiveRemoveDir( $dir."/".$object );
-				} else {
-					unlink( $dir."/".$object );
-				}
-			}
-		}
-		reset( $objects );
-		rmdir( $dir );
-	}
-}
\ No newline at end of file