kitodo / kitodo-presentation

dlf/lib/SolrPhpClient/Apache/Solr/Exception.php

Indentation +8 added lines, -8 removed lines

@@ -38,13 +38,13 @@
 
 class Apache_Solr_Exception extends Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: Exception.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: Exception.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-class Apache_Solr_Exception extends Exception
-{
+class Apache_Solr_Exception extends Exception {
 	/**
 	 * SVN Revision meta data for this class
 	 */

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Response.php

Indentation +183 added lines, -183 removed lines

@@ -43,213 +43,213 @@
  */
 class Apache_Solr_HttpTransport_Response
 {
-	/**
-	 * Status Messages indexed by Status Code
-	 * Obtained from: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-	 *
-	 * @var array
-	 */
-	static private $_defaultStatusMessages = array(
-		// Specific to PHP Solr Client
-		0 => "Communication Error",
+    /**
+     * Status Messages indexed by Status Code
+     * Obtained from: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+     *
+     * @var array
+     */
+    static private $_defaultStatusMessages = array(
+        // Specific to PHP Solr Client
+        0 => "Communication Error",
 		
-		// Informational 1XX
-		100 => "Continue",
-		101 => "Switching Protocols",
+        // Informational 1XX
+        100 => "Continue",
+        101 => "Switching Protocols",
 		
-		// Successful 2XX
-		200 => "OK",
-		201 => "Created",
-		202 => "Accepted",
-		203 => "Non-Authoritative Information",
-		204 => "No Content",
-		205 => "Reset Content",
-		206 => "Partial Content",
+        // Successful 2XX
+        200 => "OK",
+        201 => "Created",
+        202 => "Accepted",
+        203 => "Non-Authoritative Information",
+        204 => "No Content",
+        205 => "Reset Content",
+        206 => "Partial Content",
 		
-		// Redirection 3XX
-		300 => "Multiple Choices",
-		301 => "Moved Permanently",
-		302 => "Found",
-		303 => "See Other",
-		304 => "Not Modified",
-		305 => "Use Proxy",
-		307 => "Temporary Redirect",
+        // Redirection 3XX
+        300 => "Multiple Choices",
+        301 => "Moved Permanently",
+        302 => "Found",
+        303 => "See Other",
+        304 => "Not Modified",
+        305 => "Use Proxy",
+        307 => "Temporary Redirect",
 		
-		// Client Error 4XX
-		400 => "Bad Request",
-		401 => "Unauthorized",
-		402 => "Payment Required",
-		403 => "Forbidden",
-		404 => "Not Found",
-		405 => "Method Not Allowed",
-		406 => "Not Acceptable",
-		407 => "Proxy Authentication Required",
-		408 => "Request Timeout",
-		409 => "Conflict",
-		410 => "Gone",
-		411 => "Length Required",
-		412 => "Precondition Failed",
-		413 => "Request Entity Too Large",
-		414 => "Request-URI Too Long",
-		415 => "Unsupported Media Type",
-		416 => "Request Range Not Satisfiable",
-		417 => "Expectation Failed",
+        // Client Error 4XX
+        400 => "Bad Request",
+        401 => "Unauthorized",
+        402 => "Payment Required",
+        403 => "Forbidden",
+        404 => "Not Found",
+        405 => "Method Not Allowed",
+        406 => "Not Acceptable",
+        407 => "Proxy Authentication Required",
+        408 => "Request Timeout",
+        409 => "Conflict",
+        410 => "Gone",
+        411 => "Length Required",
+        412 => "Precondition Failed",
+        413 => "Request Entity Too Large",
+        414 => "Request-URI Too Long",
+        415 => "Unsupported Media Type",
+        416 => "Request Range Not Satisfiable",
+        417 => "Expectation Failed",
 		
-		// Server Error 5XX
-		500 => "Internal Server Error",
-		501 => "Not Implemented",
-		502 => "Bad Gateway",
-		503 => "Service Unavailable",
-		504 => "Gateway Timeout",
-		505 => "HTTP Version Not Supported"
-	);
+        // Server Error 5XX
+        500 => "Internal Server Error",
+        501 => "Not Implemented",
+        502 => "Bad Gateway",
+        503 => "Service Unavailable",
+        504 => "Gateway Timeout",
+        505 => "HTTP Version Not Supported"
+    );
 	
-	/**
-	 * Get the HTTP status message based on status code
-	 *
-	 * @return string
-	 */
-	public static function getDefaultStatusMessage($statusCode)
-	{
-		$statusCode = (int) $statusCode;
+    /**
+     * Get the HTTP status message based on status code
+     *
+     * @return string
+     */
+    public static function getDefaultStatusMessage($statusCode)
+    {
+        $statusCode = (int) $statusCode;
 		
-		if (isset(self::$_defaultStatusMessages[$statusCode]))
-		{
-			return self::$_defaultStatusMessages[$statusCode];
-		}
+        if (isset(self::$_defaultStatusMessages[$statusCode]))
+        {
+            return self::$_defaultStatusMessages[$statusCode];
+        }
 		
-		return "Unknown Status";
-	}
+        return "Unknown Status";
+    }
 	
-	/**
-	 * The response's HTTP status code
-	 *
-	 * @var integer
-	 */
-	private $_statusCode;
+    /**
+     * The response's HTTP status code
+     *
+     * @var integer
+     */
+    private $_statusCode;
 	
-	/**
-	 * The response's HTTP status message
-	 *
-	 * @var string
-	 */
-	private $_statusMessage;
+    /**
+     * The response's HTTP status message
+     *
+     * @var string
+     */
+    private $_statusMessage;
 	
-	/**
-	 * The response's mime type
-	 *
-	 * @var string
-	 */
-	private $_mimeType;
+    /**
+     * The response's mime type
+     *
+     * @var string
+     */
+    private $_mimeType;
 	
-	/**
-	 * The response's character encoding
-	 *
-	 * @var string
-	 */
-	private $_encoding;
+    /**
+     * The response's character encoding
+     *
+     * @var string
+     */
+    private $_encoding;
 	
-	/**
-	 * The response's data
-	 *
-	 * @var string
-	 */
-	private $_responseBody;
+    /**
+     * The response's data
+     *
+     * @var string
+     */
+    private $_responseBody;
 	
-	/**
-	 * Construct a HTTP transport response
-	 * 
-	 * @param integer $statusCode The HTTP status code
-	 * @param string $contentType The VALUE of the Content-Type HTTP header
-	 * @param string $responseBody The body of the HTTP response
-	 */
-	public function __construct($statusCode, $contentType, $responseBody)
-	{
-		// set the status code, make sure its an integer
-		$this->_statusCode = (int) $statusCode;
+    /**
+     * Construct a HTTP transport response
+     * 
+     * @param integer $statusCode The HTTP status code
+     * @param string $contentType The VALUE of the Content-Type HTTP header
+     * @param string $responseBody The body of the HTTP response
+     */
+    public function __construct($statusCode, $contentType, $responseBody)
+    {
+        // set the status code, make sure its an integer
+        $this->_statusCode = (int) $statusCode;
 		
-		// lookup up status message based on code
-		$this->_statusMessage = self::getDefaultStatusMessage($this->_statusCode);
+        // lookup up status message based on code
+        $this->_statusMessage = self::getDefaultStatusMessage($this->_statusCode);
 		
-		// set the response body, it should always be a string
-		$this->_responseBody = (string) $responseBody;
+        // set the response body, it should always be a string
+        $this->_responseBody = (string) $responseBody;
 		
-		// parse the content type header value for mimetype and encoding
-		// first set default values that will remain if we can't find
-		// what we're looking for in the content type
-		$this->_mimeType = "text/plain";
-		$this->_encoding = "UTF-8";
+        // parse the content type header value for mimetype and encoding
+        // first set default values that will remain if we can't find
+        // what we're looking for in the content type
+        $this->_mimeType = "text/plain";
+        $this->_encoding = "UTF-8";
 		
-		if ($contentType)
-		{
-			// now break apart the header to see if there's character encoding
-			$contentTypeParts = explode(';', $contentType, 2);
+        if ($contentType)
+        {
+            // now break apart the header to see if there's character encoding
+            $contentTypeParts = explode(';', $contentType, 2);
 
-			if (isset($contentTypeParts[0]))
-			{
-				$this->_mimeType = trim($contentTypeParts[0]);
-			}
+            if (isset($contentTypeParts[0]))
+            {
+                $this->_mimeType = trim($contentTypeParts[0]);
+            }
 
-			if (isset($contentTypeParts[1]))
-			{
-				// we have a second part, split it further
-				$contentTypeParts = explode('=', $contentTypeParts[1]);
+            if (isset($contentTypeParts[1]))
+            {
+                // we have a second part, split it further
+                $contentTypeParts = explode('=', $contentTypeParts[1]);
 
-				if (isset($contentTypeParts[1]))
-				{
-					$this->_encoding = trim($contentTypeParts[1]);
-				}
-			}
-		}
-	}
+                if (isset($contentTypeParts[1]))
+                {
+                    $this->_encoding = trim($contentTypeParts[1]);
+                }
+            }
+        }
+    }
 	
-	/**
-	 * Get the status code of the response
-	 *
-	 * @return integer
-	 */
-	public function getStatusCode()
-	{
-		return $this->_statusCode;
-	}
+    /**
+     * Get the status code of the response
+     *
+     * @return integer
+     */
+    public function getStatusCode()
+    {
+        return $this->_statusCode;
+    }
 	
-	/**
-	 * Get the status message of the response
-	 *
-	 * @return string
-	 */
-	public function getStatusMessage()
-	{
-		return $this->_statusMessage;
-	}
+    /**
+     * Get the status message of the response
+     *
+     * @return string
+     */
+    public function getStatusMessage()
+    {
+        return $this->_statusMessage;
+    }
 	
-	/**
-	 * Get the mimetype of the response body
-	 *
-	 * @return string
-	 */
-	public function getMimeType()
-	{
-		return $this->_mimeType;
-	}
+    /**
+     * Get the mimetype of the response body
+     *
+     * @return string
+     */
+    public function getMimeType()
+    {
+        return $this->_mimeType;
+    }
 	
-	/**
-	 * Get the charset encoding of the response body.
-	 *
-	 * @return string
-	 */
-	public function getEncoding()
-	{
-		return $this->_encoding;
-	}
+    /**
+     * Get the charset encoding of the response body.
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->_encoding;
+    }
 	
-	/**
-	 * Get the raw response body
-	 *
-	 * @return string
-	 */
-	public function getBody()
-	{
-		return $this->_responseBody;
-	}
+    /**
+     * Get the raw response body
+     *
+     * @return string
+     */
+    public function getBody()
+    {
+        return $this->_responseBody;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 *
 	 * @var array
 	 */
-	static private $_defaultStatusMessages = array(
+	static private $_defaultStatusMessages = array (
 		// Specific to PHP Solr Client
 		0 => "Communication Error",
 		

Braces +13 added lines, -26 removed lines

@@ -41,8 +41,7 @@ 
  * implementations and then consumed by the Apache_Solr_Response class which provides
  * decoding
  */
-class Apache_Solr_HttpTransport_Response
-{
+class Apache_Solr_HttpTransport_Response {
 	/**
 	 * Status Messages indexed by Status Code
 	 * Obtained from: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
@@ -109,12 +108,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getDefaultStatusMessage($statusCode)
-	{
+	public static function getDefaultStatusMessage($statusCode) {
 		$statusCode = (int) $statusCode;
 		
-		if (isset(self::$_defaultStatusMessages[$statusCode]))
-		{
+		if (isset(self::$_defaultStatusMessages[$statusCode])) {
 			return self::$_defaultStatusMessages[$statusCode];
 		}
 		
@@ -163,8 +160,7 @@ 
 	 * @param string $contentType The VALUE of the Content-Type HTTP header
 	 * @param string $responseBody The body of the HTTP response
 	 */
-	public function __construct($statusCode, $contentType, $responseBody)
-	{
+	public function __construct($statusCode, $contentType, $responseBody) {
 		// set the status code, make sure its an integer
 		$this->_statusCode = (int) $statusCode;
 		
@@ -180,23 +176,19 @@ 
 		$this->_mimeType = "text/plain";
 		$this->_encoding = "UTF-8";
 		
-		if ($contentType)
-		{
+		if ($contentType) {
 			// now break apart the header to see if there's character encoding
 			$contentTypeParts = explode(';', $contentType, 2);
 
-			if (isset($contentTypeParts[0]))
-			{
+			if (isset($contentTypeParts[0])) {
 				$this->_mimeType = trim($contentTypeParts[0]);
 			}
 
-			if (isset($contentTypeParts[1]))
-			{
+			if (isset($contentTypeParts[1])) {
 				// we have a second part, split it further
 				$contentTypeParts = explode('=', $contentTypeParts[1]);
 
-				if (isset($contentTypeParts[1]))
-				{
+				if (isset($contentTypeParts[1])) {
 					$this->_encoding = trim($contentTypeParts[1]);
 				}
 			}
@@ -208,8 +200,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function getStatusCode()
-	{
+	public function getStatusCode() {
 		return $this->_statusCode;
 	}
 	
@@ -218,8 +209,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getStatusMessage()
-	{
+	public function getStatusMessage() {
 		return $this->_statusMessage;
 	}
 	
@@ -228,8 +218,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getMimeType()
-	{
+	public function getMimeType() {
 		return $this->_mimeType;
 	}
 	
@@ -238,8 +227,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getEncoding()
-	{
+	public function getEncoding() {
 		return $this->_encoding;
 	}
 	
@@ -248,8 +236,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBody()
-	{
+	public function getBody() {
 		return $this->_responseBody;
 	}
 }

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Curl.php

Indentation +151 added lines, -151 removed lines

@@ -44,155 +44,155 @@
  */
 class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision:$';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id:$';
-
-	/**
-	 * Curl Session Handle
-	 *
-	 * @var resource
-	 */
-	private $_curl;
-
-	/**
-	 * Initializes a curl session
-	 */
-	public function __construct()
-	{
-		// initialize a CURL session
-		$this->_curl = curl_init();
-
-		// set common options that will not be changed during the session
-		curl_setopt_array($this->_curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
-
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
-
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false
-		));
-	}
-
-	/**
-	 * Closes a curl session
-	 */
-	function __destruct()
-	{
-		// close our curl session
-		curl_close($this->_curl);
-	}
-
-	public function performGetRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		// set curl GET options
-		curl_setopt_array($this->_curl, array(
-			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
-
-			// make sure we're GET
-			CURLOPT_HTTPGET => true,
-
-			// set the URL
-			CURLOPT_URL => $url,
-
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
-
-		// make the request
-		$responseBody = curl_exec($this->_curl);
-
-		// get info from the transfer
-		$statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performHeadRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		// set curl HEAD options
-		curl_setopt_array($this->_curl, array(
-			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
-
-			// set the URL
-			CURLOPT_URL => $url,
-
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
-
-		// make the request
-		$responseBody = curl_exec($this->_curl);
-
-		// get info from the transfer
-		$statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		// set curl POST options
-		curl_setopt_array($this->_curl, array(
-			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
-
-			// make sure we're POST
-			CURLOPT_POST => true,
-
-			// set the URL
-			CURLOPT_URL => $url,
-
-			// set the post data
-			CURLOPT_POSTFIELDS => $postData,
-
-			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
-
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
-
-		// make the request
-		$responseBody = curl_exec($this->_curl);
-
-		// get info from the transfer
-		$statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision:$';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id:$';
+
+    /**
+     * Curl Session Handle
+     *
+     * @var resource
+     */
+    private $_curl;
+
+    /**
+     * Initializes a curl session
+     */
+    public function __construct()
+    {
+        // initialize a CURL session
+        $this->_curl = curl_init();
+
+        // set common options that will not be changed during the session
+        curl_setopt_array($this->_curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
+
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
+
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false
+        ));
+    }
+
+    /**
+     * Closes a curl session
+     */
+    function __destruct()
+    {
+        // close our curl session
+        curl_close($this->_curl);
+    }
+
+    public function performGetRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        // set curl GET options
+        curl_setopt_array($this->_curl, array(
+            // make sure we're returning the body
+            CURLOPT_NOBODY => false,
+
+            // make sure we're GET
+            CURLOPT_HTTPGET => true,
+
+            // set the URL
+            CURLOPT_URL => $url,
+
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
+
+        // make the request
+        $responseBody = curl_exec($this->_curl);
+
+        // get info from the transfer
+        $statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performHeadRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        // set curl HEAD options
+        curl_setopt_array($this->_curl, array(
+            // this both sets the method to HEAD and says not to return a body
+            CURLOPT_NOBODY => true,
+
+            // set the URL
+            CURLOPT_URL => $url,
+
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
+
+        // make the request
+        $responseBody = curl_exec($this->_curl);
+
+        // get info from the transfer
+        $statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performPostRequest($url, $postData, $contentType, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        // set curl POST options
+        curl_setopt_array($this->_curl, array(
+            // make sure we're returning the body
+            CURLOPT_NOBODY => false,
+
+            // make sure we're POST
+            CURLOPT_POST => true,
+
+            // set the URL
+            CURLOPT_URL => $url,
+
+            // set the post data
+            CURLOPT_POSTFIELDS => $postData,
+
+            // set the content type
+            CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
+
+        // make the request
+        $responseBody = curl_exec($this->_curl);
+
+        // get info from the transfer
+        $statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * A Curl based HTTP transport. Uses a single curl session for all requests.
@@ -70,7 +70,7 @@ 
 		$this->_curl = curl_init();
 
 		// set common options that will not be changed during the session
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -101,7 +101,7 @@ 
 		}
 
 		// set curl GET options
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// make sure we're returning the body
 			CURLOPT_NOBODY => false,
 
@@ -135,7 +135,7 @@ 
 		}
 
 		// set curl HEAD options
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// this both sets the method to HEAD and says not to return a body
 			CURLOPT_NOBODY => true,
 
@@ -166,7 +166,7 @@ 
 		}
 
 		// set curl POST options
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// make sure we're returning the body
 			CURLOPT_NOBODY => false,
 
@@ -180,7 +180,7 @@ 
 			CURLOPT_POSTFIELDS => $postData,
 
 			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+			CURLOPT_HTTPHEADER => array ("Content-Type: {$contentType}"),
 
 			// set the timeout
 			CURLOPT_TIMEOUT => $timeout

Braces +9 added lines, -18 removed lines

@@ -42,8 +42,7 @@ 
 /**
  * A Curl based HTTP transport. Uses a single curl session for all requests.
  */
-class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract
-{
+class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -64,8 +63,7 @@ 
 	/**
 	 * Initializes a curl session
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 		// initialize a CURL session
 		$this->_curl = curl_init();
 
@@ -85,17 +83,14 @@ 
 	/**
 	 * Closes a curl session
 	 */
-	function __destruct()
-	{
+	function __destruct() {
 		// close our curl session
 		curl_close($this->_curl);
 	}
 
-	public function performGetRequest($url, $timeout = false)
-	{
+	public function performGetRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -125,11 +120,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
-	{
+	public function performHeadRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -156,11 +149,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
+	public function performPostRequest($url, $postData, $contentType, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}

Upper-Lower-Casing +14 added lines, -14 removed lines

@@ -72,13 +72,13 @@ 
 		// set common options that will not be changed during the session
 		curl_setopt_array($this->_curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false
+			CURLOPT_HEADER => FALSE
 		));
 	}
 
@@ -91,10 +91,10 @@ 
 		curl_close($this->_curl);
 	}
 
-	public function performGetRequest($url, $timeout = false)
+	public function performGetRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -103,10 +103,10 @@ 
 		// set curl GET options
 		curl_setopt_array($this->_curl, array(
 			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
+			CURLOPT_NOBODY => FALSE,
 
 			// make sure we're GET
-			CURLOPT_HTTPGET => true,
+			CURLOPT_HTTPGET => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,
@@ -125,10 +125,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
+	public function performHeadRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -137,7 +137,7 @@ 
 		// set curl HEAD options
 		curl_setopt_array($this->_curl, array(
 			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
+			CURLOPT_NOBODY => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,
@@ -156,10 +156,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
+	public function performPostRequest($url, $postData, $contentType, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -168,10 +168,10 @@ 
 		// set curl POST options
 		curl_setopt_array($this->_curl, array(
 			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
+			CURLOPT_NOBODY => FALSE,
 
 			// make sure we're POST
-			CURLOPT_POST => true,
+			CURLOPT_POST => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/CurlNoReuse.php

Indentation +116 added lines, -116 removed lines

@@ -46,151 +46,151 @@
  */
 class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision:$';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id:$';
-
-	public function performGetRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision:$';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id:$';
+
+    public function performGetRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
 		
-		$curl = curl_init();
+        $curl = curl_init();
 
-		// set curl GET options
-		curl_setopt_array($curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+        // set curl GET options
+        curl_setopt_array($curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
 
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
 
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false,
 			
-			// set the URL
-			CURLOPT_URL => $url,
+            // set the URL
+            CURLOPT_URL => $url,
 
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
 
-		// make the request
-		$responseBody = curl_exec($curl);
+        // make the request
+        $responseBody = curl_exec($curl);
 
-		// get info from the transfer
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        // get info from the transfer
+        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
 		
-		// close our curl session - we're done with it
-		curl_close($curl);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performHeadRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
+        // close our curl session - we're done with it
+        curl_close($curl);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performHeadRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
 		
-		$curl = curl_init();
+        $curl = curl_init();
 
-		// set curl HEAD options
-		curl_setopt_array($curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+        // set curl HEAD options
+        curl_setopt_array($curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
 
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
 
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false,
 			
-			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
+            // this both sets the method to HEAD and says not to return a body
+            CURLOPT_NOBODY => true,
 
-			// set the URL
-			CURLOPT_URL => $url,
+            // set the URL
+            CURLOPT_URL => $url,
 
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
 
-		// make the request
-		$responseBody = curl_exec($curl);
+        // make the request
+        $responseBody = curl_exec($curl);
 
-		// get info from the transfer
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        // get info from the transfer
+        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
 		
-		// close our curl session - we're done with it
-		curl_close($curl);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		$curl = curl_init();
+        // close our curl session - we're done with it
+        curl_close($curl);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performPostRequest($url, $postData, $contentType, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        $curl = curl_init();
 		
-		// set curl POST options
-		curl_setopt_array($curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+        // set curl POST options
+        curl_setopt_array($curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
 
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
 
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false,
 			
-			// make sure we're POST
-			CURLOPT_POST => true,
+            // make sure we're POST
+            CURLOPT_POST => true,
 
-			// set the URL
-			CURLOPT_URL => $url,
+            // set the URL
+            CURLOPT_URL => $url,
 
-			// set the post data
-			CURLOPT_POSTFIELDS => $postData,
+            // set the post data
+            CURLOPT_POSTFIELDS => $postData,
 
-			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+            // set the content type
+            CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
 
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
 
-		// make the request
-		$responseBody = curl_exec($curl);
+        // make the request
+        $responseBody = curl_exec($curl);
 
-		// get info from the transfer
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        // get info from the transfer
+        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
 
-		// close our curl session - we're done with it
-		curl_close($curl);
+        // close our curl session - we're done with it
+        curl_close($curl);
 
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * An alternative Curl HTTP transport that opens and closes a curl session for
@@ -68,7 +68,7 @@ 
 		$curl = curl_init();
 
 		// set curl GET options
-		curl_setopt_array($curl, array(
+		curl_setopt_array($curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -110,7 +110,7 @@ 
 		$curl = curl_init();
 
 		// set curl HEAD options
-		curl_setopt_array($curl, array(
+		curl_setopt_array($curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -155,7 +155,7 @@ 
 		$curl = curl_init();
 		
 		// set curl POST options
-		curl_setopt_array($curl, array(
+		curl_setopt_array($curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -175,7 +175,7 @@ 
 			CURLOPT_POSTFIELDS => $postData,
 
 			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+			CURLOPT_HTTPHEADER => array ("Content-Type: {$contentType}"),
 
 			// set the timeout
 			CURLOPT_TIMEOUT => $timeout

Braces +7 added lines, -14 removed lines

@@ -44,8 +44,7 @@ 
  * every request. This isn't the recommended way to use curl, but some version of
  * PHP have memory issues.
  */
-class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract
-{
+class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -56,11 +55,9 @@ 
 	 */
 	const SVN_ID = '$Id:$';
 
-	public function performGetRequest($url, $timeout = false)
-	{
+	public function performGetRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -98,11 +95,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
-	{
+	public function performHeadRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -143,11 +138,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
+	public function performPostRequest($url, $postData, $contentType, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -56,10 +56,10 @@ 
 	 */
 	const SVN_ID = '$Id:$';
 
-	public function performGetRequest($url, $timeout = false)
+	public function performGetRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -70,13 +70,13 @@ 
 		// set curl GET options
 		curl_setopt_array($curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+			CURLOPT_HEADER => FALSE,
 			
 			// set the URL
 			CURLOPT_URL => $url,
@@ -98,10 +98,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
+	public function performHeadRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -112,16 +112,16 @@ 
 		// set curl HEAD options
 		curl_setopt_array($curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+			CURLOPT_HEADER => FALSE,
 			
 			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
+			CURLOPT_NOBODY => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,
@@ -143,10 +143,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
+	public function performPostRequest($url, $postData, $contentType, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -157,16 +157,16 @@ 
 		// set curl POST options
 		curl_setopt_array($curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+			CURLOPT_HEADER => FALSE,
 			
 			// make sure we're POST
-			CURLOPT_POST => true,
+			CURLOPT_POST => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Abstract.php

Indentation +39 added lines, -39 removed lines

@@ -42,48 +42,48 @@
  */
 abstract class Apache_Solr_HttpTransport_Abstract implements Apache_Solr_HttpTransport_Interface
 {	
-	/**
-	 * Our default timeout value for requests that don't specify a timeout
-	 *
-	 * @var float
-	 */
-	private $_defaultTimeout = false;
+    /**
+     * Our default timeout value for requests that don't specify a timeout
+     *
+     * @var float
+     */
+    private $_defaultTimeout = false;
 		
-	/**
-	 * Get the current default timeout setting (initially the default_socket_timeout ini setting)
-	 * in seconds
-	 *
-	 * @return float
-	 */
-	public function getDefaultTimeout()
-	{
-		// lazy load the default timeout from the ini settings
-		if ($this->_defaultTimeout === false)
-		{
-			$this->_defaultTimeout = (int) ini_get('default_socket_timeout');
+    /**
+     * Get the current default timeout setting (initially the default_socket_timeout ini setting)
+     * in seconds
+     *
+     * @return float
+     */
+    public function getDefaultTimeout()
+    {
+        // lazy load the default timeout from the ini settings
+        if ($this->_defaultTimeout === false)
+        {
+            $this->_defaultTimeout = (int) ini_get('default_socket_timeout');
 
-			// double check we didn't get 0 for a timeout
-			if ($this->_defaultTimeout <= 0)
-			{
-				$this->_defaultTimeout = 60;
-			}
-		}
+            // double check we didn't get 0 for a timeout
+            if ($this->_defaultTimeout <= 0)
+            {
+                $this->_defaultTimeout = 60;
+            }
+        }
 		
-		return $this->_defaultTimeout;
-	}
+        return $this->_defaultTimeout;
+    }
 	
-	/**
-	 * Set the current default timeout for all HTTP requests
-	 *
-	 * @param float $timeout
-	 */
-	public function setDefaultTimeout($timeout)
-	{
-		$timeout = (float) $timeout;
+    /**
+     * Set the current default timeout for all HTTP requests
+     *
+     * @param float $timeout
+     */
+    public function setDefaultTimeout($timeout)
+    {
+        $timeout = (float) $timeout;
 		
-		if ($timeout >= 0)
-		{
-			$this->_defaultTimeout = $timeout;
-		}
-	}	
+        if ($timeout >= 0)
+        {
+            $this->_defaultTimeout = $timeout;
+        }
+    }	
 }
\ No newline at end of file

Braces +6 added lines, -12 removed lines

@@ -40,8 +40,7 @@ 
  * Convenience class that implements the transport implementation. Can be extended by
  * real implementations to do some of the common book keeping
  */
-abstract class Apache_Solr_HttpTransport_Abstract implements Apache_Solr_HttpTransport_Interface
-{	
+abstract class Apache_Solr_HttpTransport_Abstract implements Apache_Solr_HttpTransport_Interface {
 	/**
 	 * Our default timeout value for requests that don't specify a timeout
 	 *
@@ -55,16 +54,13 @@ 
 	 *
 	 * @return float
 	 */
-	public function getDefaultTimeout()
-	{
+	public function getDefaultTimeout() {
 		// lazy load the default timeout from the ini settings
-		if ($this->_defaultTimeout === false)
-		{
+		if ($this->_defaultTimeout === false) {
 			$this->_defaultTimeout = (int) ini_get('default_socket_timeout');
 
 			// double check we didn't get 0 for a timeout
-			if ($this->_defaultTimeout <= 0)
-			{
+			if ($this->_defaultTimeout <= 0) {
 				$this->_defaultTimeout = 60;
 			}
 		}
@@ -77,12 +73,10 @@ 
 	 *
 	 * @param float $timeout
 	 */
-	public function setDefaultTimeout($timeout)
-	{
+	public function setDefaultTimeout($timeout) {
 		$timeout = (float) $timeout;
 		
-		if ($timeout >= 0)
-		{
+		if ($timeout >= 0) {
 			$this->_defaultTimeout = $timeout;
 		}
 	}	

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 	 *
 	 * @var float
 	 */
-	private $_defaultTimeout = false;
+	private $_defaultTimeout = FALSE;
 		
 	/**
 	 * Get the current default timeout setting (initially the default_socket_timeout ini setting)
@@ -58,7 +58,7 @@ 
 	public function getDefaultTimeout()
 	{
 		// lazy load the default timeout from the ini settings
-		if ($this->_defaultTimeout === false)
+		if ($this->_defaultTimeout === FALSE)
 		{
 			$this->_defaultTimeout = (int) ini_get('default_socket_timeout');
 

dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php

Indentation +160 added lines, -160 removed lines

@@ -44,173 +44,173 @@
  */
 class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision:  $';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id:  $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision:  $';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id:  $';
 		
-	/**
-	 * Reusable stream context resources for GET and POST operations
-	 *
-	 * @var resource
-	 */
-	private $_getContext, $_headContext, $_postContext;
+    /**
+     * Reusable stream context resources for GET and POST operations
+     *
+     * @var resource
+     */
+    private $_getContext, $_headContext, $_postContext;
 	
-	/**
-	 * Initializes our reuseable get and post stream contexts
-	 */
-	public function __construct()
-	{
-		$this->_getContext = stream_context_create();
-		$this->_headContext = stream_context_create();
-		$this->_postContext = stream_context_create();
-	}
-
-	public function performGetRequest($url, $timeout = false)
-	{
-		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
-			// timeouts with file_get_contents seem to need
-			// to be halved to work as expected
-			$timeout = (float) $timeout / 2;
-
-			stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
-		}
-		else
-		{
-			// use the default timeout pulled from default_socket_timeout otherwise
-			stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());
-		}
-
-		// $http_response_headers will be updated by the call to file_get_contents later
-		// see http://us.php.net/manual/en/wrappers.http.php for documentation
-		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_getContext);
+    /**
+     * Initializes our reuseable get and post stream contexts
+     */
+    public function __construct()
+    {
+        $this->_getContext = stream_context_create();
+        $this->_headContext = stream_context_create();
+        $this->_postContext = stream_context_create();
+    }
+
+    public function performGetRequest($url, $timeout = false)
+    {
+        // set the timeout if specified
+        if ($timeout !== FALSE && $timeout > 0.0)
+        {
+            // timeouts with file_get_contents seem to need
+            // to be halved to work as expected
+            $timeout = (float) $timeout / 2;
+
+            stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
+        }
+        else
+        {
+            // use the default timeout pulled from default_socket_timeout otherwise
+            stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());
+        }
+
+        // $http_response_headers will be updated by the call to file_get_contents later
+        // see http://us.php.net/manual/en/wrappers.http.php for documentation
+        // Unfortunately, it will still create a notice in analyzers if we don't set it here
+        $http_response_header = null;
+        $responseBody = @file_get_contents($url, false, $this->_getContext);
 		
-		return $this->_getResponseFromParts($responseBody, $http_response_header);
-	}
-
-	public function performHeadRequest($url, $timeout = false)
-	{
-		stream_context_set_option($this->_headContext, array(
-				'http' => array(
-					// set HTTP method
-					'method' => 'HEAD',
-
-					// default timeout
-					'timeout' => $this->getDefaultTimeout()
-				)
-			)
-		);
-
-		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
-			// timeouts with file_get_contents seem to need
-			// to be halved to work as expected
-			$timeout = (float) $timeout / 2;
-
-			stream_context_set_option($this->_headContext, 'http', 'timeout', $timeout);
-		}
+        return $this->_getResponseFromParts($responseBody, $http_response_header);
+    }
+
+    public function performHeadRequest($url, $timeout = false)
+    {
+        stream_context_set_option($this->_headContext, array(
+                'http' => array(
+                    // set HTTP method
+                    'method' => 'HEAD',
+
+                    // default timeout
+                    'timeout' => $this->getDefaultTimeout()
+                )
+            )
+        );
+
+        // set the timeout if specified
+        if ($timeout !== FALSE && $timeout > 0.0)
+        {
+            // timeouts with file_get_contents seem to need
+            // to be halved to work as expected
+            $timeout = (float) $timeout / 2;
+
+            stream_context_set_option($this->_headContext, 'http', 'timeout', $timeout);
+        }
 		
-		// $http_response_headers will be updated by the call to file_get_contents later
-		// see http://us.php.net/manual/en/wrappers.http.php for documentation
-		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_headContext);
-
-		return $this->_getResponseFromParts($responseBody, $http_response_header);
-	}
+        // $http_response_headers will be updated by the call to file_get_contents later
+        // see http://us.php.net/manual/en/wrappers.http.php for documentation
+        // Unfortunately, it will still create a notice in analyzers if we don't set it here
+        $http_response_header = null;
+        $responseBody = @file_get_contents($url, false, $this->_headContext);
+
+        return $this->_getResponseFromParts($responseBody, $http_response_header);
+    }
 	
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
-	{
-		stream_context_set_option($this->_postContext, array(
-				'http' => array(
-					// set HTTP method
-					'method' => 'POST',
-
-					// Add our posted content type
-					'header' => "Content-Type: $contentType",
-
-					// the posted content
-					'content' => $rawPost,
-
-					// default timeout
-					'timeout' => $this->getDefaultTimeout()
-				)
-			)
-		);
-
-		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
-			// timeouts with file_get_contents seem to need
-			// to be halved to work as expected
-			$timeout = (float) $timeout / 2;
-
-			stream_context_set_option($this->_postContext, 'http', 'timeout', $timeout);
-		}
-
-		// $http_response_header will be updated by the call to file_get_contents later
-		// see http://us.php.net/manual/en/wrappers.http.php for documentation
-		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_postContext);
+    public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
+    {
+        stream_context_set_option($this->_postContext, array(
+                'http' => array(
+                    // set HTTP method
+                    'method' => 'POST',
+
+                    // Add our posted content type
+                    'header' => "Content-Type: $contentType",
+
+                    // the posted content
+                    'content' => $rawPost,
+
+                    // default timeout
+                    'timeout' => $this->getDefaultTimeout()
+                )
+            )
+        );
+
+        // set the timeout if specified
+        if ($timeout !== FALSE && $timeout > 0.0)
+        {
+            // timeouts with file_get_contents seem to need
+            // to be halved to work as expected
+            $timeout = (float) $timeout / 2;
+
+            stream_context_set_option($this->_postContext, 'http', 'timeout', $timeout);
+        }
+
+        // $http_response_header will be updated by the call to file_get_contents later
+        // see http://us.php.net/manual/en/wrappers.http.php for documentation
+        // Unfortunately, it will still create a notice in analyzers if we don't set it here
+        $http_response_header = null;
+        $responseBody = @file_get_contents($url, false, $this->_postContext);
 		
-		// reset content of post context to reclaim memory
-		stream_context_set_option($this->_postContext, 'http', 'content', '');
+        // reset content of post context to reclaim memory
+        stream_context_set_option($this->_postContext, 'http', 'content', '');
 		
-		return $this->_getResponseFromParts($responseBody, $http_response_header);
-	}
+        return $this->_getResponseFromParts($responseBody, $http_response_header);
+    }
 	
-	private function _getResponseFromParts($rawResponse, $httpHeaders)
-	{
-		//Assume 0, false as defaults
-		$status = 0;
-		$contentType = false;
-
-		//iterate through headers for real status, type, and encoding
-		if (is_array($httpHeaders) && count($httpHeaders) > 0)
-		{
-			//look at the first headers for the HTTP status code
-			//and message (errors are usually returned this way)
-			//
-			//HTTP 100 Continue response can also be returned before
-			//the REAL status header, so we need look until we find
-			//the last header starting with HTTP
-			//
-			//the spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.1
-			//
-			//Thanks to Daniel Andersson for pointing out this oversight
-			while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP')
-			{
-				// we can do a intval on status line without the "HTTP/1.X " to get the code
-				$status = intval(substr($httpHeaders[0], 9));
-
-				// remove this from the headers so we can check for more
-				array_shift($httpHeaders);
-			}
-
-			//Look for the Content-Type response header and determine type
-			//and encoding from it (if possible - such as 'Content-Type: text/plain; charset=UTF-8')
-			foreach ($httpHeaders as $header)
-			{
-				// look for the header that starts appropriately
-				if (strncasecmp($header, 'Content-Type:', 13) == 0)
-				{
-					$contentType = substr($header, 13);
-					break;
-				}
-			}
-		}
+    private function _getResponseFromParts($rawResponse, $httpHeaders)
+    {
+        //Assume 0, false as defaults
+        $status = 0;
+        $contentType = false;
+
+        //iterate through headers for real status, type, and encoding
+        if (is_array($httpHeaders) && count($httpHeaders) > 0)
+        {
+            //look at the first headers for the HTTP status code
+            //and message (errors are usually returned this way)
+            //
+            //HTTP 100 Continue response can also be returned before
+            //the REAL status header, so we need look until we find
+            //the last header starting with HTTP
+            //
+            //the spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.1
+            //
+            //Thanks to Daniel Andersson for pointing out this oversight
+            while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP')
+            {
+                // we can do a intval on status line without the "HTTP/1.X " to get the code
+                $status = intval(substr($httpHeaders[0], 9));
+
+                // remove this from the headers so we can check for more
+                array_shift($httpHeaders);
+            }
+
+            //Look for the Content-Type response header and determine type
+            //and encoding from it (if possible - such as 'Content-Type: text/plain; charset=UTF-8')
+            foreach ($httpHeaders as $header)
+            {
+                // look for the header that starts appropriately
+                if (strncasecmp($header, 'Content-Type:', 13) == 0)
+                {
+                    $contentType = substr($header, 13);
+                    break;
+                }
+            }
+        }
 		
-		return new Apache_Solr_HttpTransport_Response($status, $contentType, $rawResponse);
-	}
+        return new Apache_Solr_HttpTransport_Response($status, $contentType, $rawResponse);
+    }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * HTTP Transport implemenation that uses the builtin http URL wrappers and file_get_contents
@@ -99,8 +99,8 @@ 
 
 	public function performHeadRequest($url, $timeout = false)
 	{
-		stream_context_set_option($this->_headContext, array(
-				'http' => array(
+		stream_context_set_option($this->_headContext, array (
+				'http' => array (
 					// set HTTP method
 					'method' => 'HEAD',
 
@@ -131,8 +131,8 @@ 
 	
 	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
 	{
-		stream_context_set_option($this->_postContext, array(
-				'http' => array(
+		stream_context_set_option($this->_postContext, array (
+				'http' => array (
 					// set HTTP method
 					'method' => 'POST',
 

Braces +14 added lines, -29 removed lines

@@ -42,8 +42,7 @@ 
 /**
  * HTTP Transport implemenation that uses the builtin http URL wrappers and file_get_contents
  */
-class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract
-{
+class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -64,26 +63,21 @@ 
 	/**
 	 * Initializes our reuseable get and post stream contexts
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 		$this->_getContext = stream_context_create();
 		$this->_headContext = stream_context_create();
 		$this->_postContext = stream_context_create();
 	}
 
-	public function performGetRequest($url, $timeout = false)
-	{
+	public function performGetRequest($url, $timeout = false) {
 		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
+		if ($timeout !== FALSE && $timeout > 0.0) {
 			// timeouts with file_get_contents seem to need
 			// to be halved to work as expected
 			$timeout = (float) $timeout / 2;
 
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
-		}
-		else
-		{
+		} else {
 			// use the default timeout pulled from default_socket_timeout otherwise
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());
 		}
@@ -97,8 +91,7 @@ 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
-	{
+	public function performHeadRequest($url, $timeout = false) {
 		stream_context_set_option($this->_headContext, array(
 				'http' => array(
 					// set HTTP method
@@ -111,8 +104,7 @@ 
 		);
 
 		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
+		if ($timeout !== FALSE && $timeout > 0.0) {
 			// timeouts with file_get_contents seem to need
 			// to be halved to work as expected
 			$timeout = (float) $timeout / 2;
@@ -129,8 +121,7 @@ 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 	
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
-	{
+	public function performPostRequest($url, $rawPost, $contentType, $timeout = false) {
 		stream_context_set_option($this->_postContext, array(
 				'http' => array(
 					// set HTTP method
@@ -149,8 +140,7 @@ 
 		);
 
 		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
+		if ($timeout !== FALSE && $timeout > 0.0) {
 			// timeouts with file_get_contents seem to need
 			// to be halved to work as expected
 			$timeout = (float) $timeout / 2;
@@ -170,15 +160,13 @@ 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 	
-	private function _getResponseFromParts($rawResponse, $httpHeaders)
-	{
+	private function _getResponseFromParts($rawResponse, $httpHeaders) {
 		//Assume 0, false as defaults
 		$status = 0;
 		$contentType = false;
 
 		//iterate through headers for real status, type, and encoding
-		if (is_array($httpHeaders) && count($httpHeaders) > 0)
-		{
+		if (is_array($httpHeaders) && count($httpHeaders) > 0) {
 			//look at the first headers for the HTTP status code
 			//and message (errors are usually returned this way)
 			//
@@ -189,8 +177,7 @@ 
 			//the spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.1
 			//
 			//Thanks to Daniel Andersson for pointing out this oversight
-			while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP')
-			{
+			while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP') {
 				// we can do a intval on status line without the "HTTP/1.X " to get the code
 				$status = intval(substr($httpHeaders[0], 9));
 
@@ -200,11 +187,9 @@ 
 
 			//Look for the Content-Type response header and determine type
 			//and encoding from it (if possible - such as 'Content-Type: text/plain; charset=UTF-8')
-			foreach ($httpHeaders as $header)
-			{
+			foreach ($httpHeaders as $header) {
 				// look for the header that starts appropriately
-				if (strncasecmp($header, 'Content-Type:', 13) == 0)
-				{
+				if (strncasecmp($header, 'Content-Type:', 13) == 0) {
 					$contentType = substr($header, 13);
 					break;
 				}

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -71,7 +71,7 @@ 
 		$this->_postContext = stream_context_create();
 	}
 
-	public function performGetRequest($url, $timeout = false)
+	public function performGetRequest($url, $timeout = FALSE)
 	{
 		// set the timeout if specified
 		if ($timeout !== FALSE && $timeout > 0.0)
@@ -91,13 +91,13 @@ 
 		// $http_response_headers will be updated by the call to file_get_contents later
 		// see http://us.php.net/manual/en/wrappers.http.php for documentation
 		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_getContext);
+		$http_response_header = NULL;
+		$responseBody = @file_get_contents($url, FALSE, $this->_getContext);
 		
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
+	public function performHeadRequest($url, $timeout = FALSE)
 	{
 		stream_context_set_option($this->_headContext, array(
 				'http' => array(
@@ -123,13 +123,13 @@ 
 		// $http_response_headers will be updated by the call to file_get_contents later
 		// see http://us.php.net/manual/en/wrappers.http.php for documentation
 		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_headContext);
+		$http_response_header = NULL;
+		$responseBody = @file_get_contents($url, FALSE, $this->_headContext);
 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 	
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
+	public function performPostRequest($url, $rawPost, $contentType, $timeout = FALSE)
 	{
 		stream_context_set_option($this->_postContext, array(
 				'http' => array(
@@ -161,8 +161,8 @@ 
 		// $http_response_header will be updated by the call to file_get_contents later
 		// see http://us.php.net/manual/en/wrappers.http.php for documentation
 		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_postContext);
+		$http_response_header = NULL;
+		$responseBody = @file_get_contents($url, FALSE, $this->_postContext);
 		
 		// reset content of post context to reclaim memory
 		stream_context_set_option($this->_postContext, 'http', 'content', '');
@@ -174,7 +174,7 @@ 
 	{
 		//Assume 0, false as defaults
 		$status = 0;
-		$contentType = false;
+		$contentType = FALSE;
 
 		//iterate through headers for real status, type, and encoding
 		if (is_array($httpHeaders) && count($httpHeaders) > 0)

dlf/class.ext_update.php

Indentation +186 added lines, -186 removed lines

@@ -19,265 +19,265 @@
  */
 class ext_update {
 
-	/**
-	 * This holds the output ready to return
-	 *
-	 * @var	string
-	 * @access protected
-	 */
-	protected $content = '';
+    /**
+     * This holds the output ready to return
+     *
+     * @var	string
+     * @access protected
+     */
+    protected $content = '';
 
-	/**
-	 * Triggers the update option in the extension manager
-	 *
-	 * @access	public
-	 *
-	 * @return	boolean		Should the update option be shown?
-	 */
-	public function access() {
+    /**
+     * Triggers the update option in the extension manager
+     *
+     * @access	public
+     *
+     * @return	boolean		Should the update option be shown?
+     */
+    public function access() {
 
-		if (count($this->getMetadataConfig())) {
+        if (count($this->getMetadataConfig())) {
 
-			return TRUE;
+            return TRUE;
 
-		} else if ($this->oldIndexRelatedTableNames()) {
+        } else if ($this->oldIndexRelatedTableNames()) {
 
-			return TRUE;
+            return TRUE;
 
-		}
+        }
 
-		return FALSE;
+        return FALSE;
 
-	}
+    }
 
-	/**
-	 * Get all outdated metadata configuration records
-	 *
-	 * @access	protected
-	 *
-	 * @return	array		Array of UIDs of outdated records
-	 */
-	protected function getMetadataConfig() {
+    /**
+     * Get all outdated metadata configuration records
+     *
+     * @access	protected
+     *
+     * @return	array		Array of UIDs of outdated records
+     */
+    protected function getMetadataConfig() {
 
-		$uids = array ();
+        $uids = array ();
 
-		// check if tx_dlf_metadata.xpath exists anyhow
-		$fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
+        // check if tx_dlf_metadata.xpath exists anyhow
+        $fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
 
-		if (! in_array('xpath', array_keys($fieldsInDatabase))) {
+        if (! in_array('xpath', array_keys($fieldsInDatabase))) {
 
-			return $uids;
+            return $uids;
 
-		}
+        }
 
-		// Get all records with outdated configuration.
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_metadata.uid AS uid',
-			'tx_dlf_metadata',
-			'tx_dlf_metadata.format=0 AND NOT tx_dlf_metadata.xpath=\'\''.tx_dlf_helper::whereClause('tx_dlf_metadata'),
-			'',
-			'',
-			''
-		);
+        // Get all records with outdated configuration.
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_metadata.uid AS uid',
+            'tx_dlf_metadata',
+            'tx_dlf_metadata.format=0 AND NOT tx_dlf_metadata.xpath=\'\''.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+            '',
+            '',
+            ''
+        );
 
-		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+            while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-				$uids[] = intval($resArray['uid']);
+                $uids[] = intval($resArray['uid']);
 
-			}
+            }
 
-		}
+        }
 
-		return $uids;
+        return $uids;
 
-	}
+    }
 
-	/**
-	 * The main method of the class
-	 *
-	 * @access	public
-	 *
-	 * @return	string		The content that is displayed on the website
-	 */
-	public function main() {
+    /**
+     * The main method of the class
+     *
+     * @access	public
+     *
+     * @return	string		The content that is displayed on the website
+     */
+    public function main() {
 
-		// Load localization file.
-		$GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
+        // Load localization file.
+        $GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
 
-		// Update the metadata configuration.
-		if (count($this->getMetadataConfig())) {
-			$this->updateMetadataConfig();
-		}
+        // Update the metadata configuration.
+        if (count($this->getMetadataConfig())) {
+            $this->updateMetadataConfig();
+        }
 
-		if ($this->oldIndexRelatedTableNames()) {
+        if ($this->oldIndexRelatedTableNames()) {
 
-			$this->renameIndexRelatedColumns();
+            $this->renameIndexRelatedColumns();
 
-		}
+        }
 
-		return $this->content;
+        return $this->content;
 
-	}
+    }
 
-	/**
-	 * Check for old index related colums
-	 *
-	 * @access	protected
-	 *
-	 * @return	boolean		true if old index related columns exist
-	 */
-	protected function oldIndexRelatedTableNames() {
+    /**
+     * Check for old index related colums
+     *
+     * @access	protected
+     *
+     * @return	boolean		true if old index related columns exist
+     */
+    protected function oldIndexRelatedTableNames() {
 
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'column_name',
-			'INFORMATION_SCHEMA.COLUMNS',
-			'TABLE_NAME = "tx_dlf_metadata"',
-			'',
-			'',
-			''
-			);
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'column_name',
+            'INFORMATION_SCHEMA.COLUMNS',
+            'TABLE_NAME = "tx_dlf_metadata"',
+            '',
+            '',
+            ''
+            );
 
-		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 			
-			if($resArray['column_name'] == 'tokenized' 
-				|| $resArray['column_name'] == 'stored'
-				|| $resArray['column_name'] == 'indexed'
-				|| $resArray['column_name'] == 'boost'
-				|| $resArray['column_name'] == 'autocomplete') {
+            if($resArray['column_name'] == 'tokenized' 
+                || $resArray['column_name'] == 'stored'
+                || $resArray['column_name'] == 'indexed'
+                || $resArray['column_name'] == 'boost'
+                || $resArray['column_name'] == 'autocomplete') {
 
-					return TRUE;
+                    return TRUE;
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Copy the data of the old index related columns to the new columns
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function renameIndexRelatedColumns() {
+    /**
+     * Copy the data of the old index related columns to the new columns
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function renameIndexRelatedColumns() {
 
-		$sqlQuery = "UPDATE tx_dlf_metadata SET `index_tokenized` = `tokenized`
+        $sqlQuery = "UPDATE tx_dlf_metadata SET `index_tokenized` = `tokenized`
 											, `index_stored` = `stored`
 											, `index_indexed` = `indexed`
 											, `index_boost` = `boost`
 											, `index_autocomplete` = `autocomplete`";
 
-		// Copy the content of the old tables to the new ones
-		$result = $GLOBALS['TYPO3_DB']->sql_query($sqlQuery);
+        // Copy the content of the old tables to the new ones
+        $result = $GLOBALS['TYPO3_DB']->sql_query($sqlQuery);
 
-		if($result) {
+        if($result) {
 
-			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsOkay', TRUE),
-				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-				FALSE
-				);
+            $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsOkay', TRUE),
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                FALSE
+                );
 
-		} else {
+        } else {
 
-			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsNotOkay', TRUE),
-				$GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-				FALSE
-				);
+            $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsNotOkay', TRUE),
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+                FALSE
+                );
 
-		}
+        }
 
-		$this->content .= $message->render();
+        $this->content .= $message->render();
 
-	}
+    }
 
-	/**
-	 * Update all outdated metadata configuration records
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function updateMetadataConfig() {
+    /**
+     * Update all outdated metadata configuration records
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function updateMetadataConfig() {
 
-		$metadataUids = $this->getMetadataConfig();
+        $metadataUids = $this->getMetadataConfig();
 
-		if (!empty($metadataUids)) {
+        if (!empty($metadataUids)) {
 
-			$data = array ();
+            $data = array ();
 
-			// Get all old metadata configuration records.
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'tx_dlf_metadata.uid AS uid,tx_dlf_metadata.pid AS pid,tx_dlf_metadata.cruser_id AS cruser_id,tx_dlf_metadata.encoded AS encoded,tx_dlf_metadata.xpath AS xpath,tx_dlf_metadata.xpath_sorting AS xpath_sorting',
-				'tx_dlf_metadata',
-				'tx_dlf_metadata.uid IN ('.implode(',', $metadataUids).')'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
-				'',
-				'',
-				''
-			);
+            // Get all old metadata configuration records.
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'tx_dlf_metadata.uid AS uid,tx_dlf_metadata.pid AS pid,tx_dlf_metadata.cruser_id AS cruser_id,tx_dlf_metadata.encoded AS encoded,tx_dlf_metadata.xpath AS xpath,tx_dlf_metadata.xpath_sorting AS xpath_sorting',
+                'tx_dlf_metadata',
+                'tx_dlf_metadata.uid IN ('.implode(',', $metadataUids).')'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                '',
+                '',
+                ''
+            );
 
-			while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
+            while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-				$newId = uniqid('NEW');
+                $newId = uniqid('NEW');
 
-				// Copy record to new table.
-				$data['tx_dlf_metadataformat'][$newId] = array (
-					'pid' => $resArray['pid'],
-					'cruser_id' => $resArray['cruser_id'],
-					'parent_id' => $resArray['uid'],
-					'encoded' => $resArray['encoded'],
-					'xpath' => $resArray['xpath'],
-					'xpath_sorting' => $resArray['xpath_sorting']
-				);
+                // Copy record to new table.
+                $data['tx_dlf_metadataformat'][$newId] = array (
+                    'pid' => $resArray['pid'],
+                    'cruser_id' => $resArray['cruser_id'],
+                    'parent_id' => $resArray['uid'],
+                    'encoded' => $resArray['encoded'],
+                    'xpath' => $resArray['xpath'],
+                    'xpath_sorting' => $resArray['xpath_sorting']
+                );
 
-				// Add reference to old table.
-				$data['tx_dlf_metadata'][$resArray['uid']]['format'] = $newId;
+                // Add reference to old table.
+                $data['tx_dlf_metadata'][$resArray['uid']]['format'] = $newId;
 
-			}
+            }
 
-			if (!empty($data)) {
+            if (!empty($data)) {
 
-				// Process datamap.
-				$substUids = tx_dlf_helper::processDBasAdmin($data);
+                // Process datamap.
+                $substUids = tx_dlf_helper::processDBasAdmin($data);
 
-				unset ($data);
+                unset ($data);
 
-				if (!empty($substUids)) {
+                if (!empty($substUids)) {
 
-					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						$GLOBALS['LANG']->getLL('update.metadataConfigOkay', TRUE),
-						$GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-						FALSE
-					);
+                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        $GLOBALS['LANG']->getLL('update.metadataConfigOkay', TRUE),
+                        $GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                        FALSE
+                    );
 
-				} else {
+                } else {
 
-					$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						$GLOBALS['LANG']->getLL('update.metadataConfigNotOkay', TRUE),
-						$GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-						FALSE
-					);
+                    $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        $GLOBALS['LANG']->getLL('update.metadataConfigNotOkay', TRUE),
+                        $GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+                        FALSE
+                    );
 
-				}
+                }
 
-				$this->content .= $message->render();
+                $this->content .= $message->render();
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
 		// check if tx_dlf_metadata.xpath exists anyhow
 		$fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
 
-		if (! in_array('xpath', array_keys($fieldsInDatabase))) {
+		if (!in_array('xpath', array_keys($fieldsInDatabase))) {
 
 			return $uids;
 
@@ -141,7 +141,7 @@ 
 
 		while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 			
-			if($resArray['column_name'] == 'tokenized' 
+			if ($resArray['column_name'] == 'tokenized' 
 				|| $resArray['column_name'] == 'stored'
 				|| $resArray['column_name'] == 'indexed'
 				|| $resArray['column_name'] == 'boost'
@@ -173,7 +173,7 @@ 
 		// Copy the content of the old tables to the new ones
 		$result = $GLOBALS['TYPO3_DB']->sql_query($sqlQuery);
 
-		if($result) {
+		if ($result) {
 
 			$message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
 				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

dlf/modules/indexing/index.php

Indentation +245 added lines, -245 removed lines

@@ -19,368 +19,368 @@
  */
 class tx_dlf_modIndexing extends tx_dlf_module {
 
-	protected $modPath = 'indexing/';
+    protected $modPath = 'indexing/';
 
-	protected $buttonArray = array (
-		'SHORTCUT' => '',
-	);
+    protected $buttonArray = array (
+        'SHORTCUT' => '',
+    );
 
-	protected $markerArray = array (
-		'CSH' => '',
-		'MOD_MENU' => '',
-		'CONTENT' => '',
-	);
+    protected $markerArray = array (
+        'CSH' => '',
+        'MOD_MENU' => '',
+        'CONTENT' => '',
+    );
 
-	/**
-	 * This holds a list of documents to index
-	 *
-	 * @var	tx_dlf_list
-	 * @access protected
-	 */
-	protected $list;
+    /**
+     * This holds a list of documents to index
+     *
+     * @var	tx_dlf_list
+     * @access protected
+     */
+    protected $list;
 
-	/**
-	 * Builds HTML form for selecting a collection
-	 *
-	 * @access	protected
-	 *
-	 * @return	string		The HTML output
-	 */
-	protected function getCollList() {
+    /**
+     * Builds HTML form for selecting a collection
+     *
+     * @access	protected
+     *
+     * @return	string		The HTML output
+     */
+    protected function getCollList() {
 
-		// Get all available Solr cores.
-		$_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
-			'tx_dlf_solrcores',
-			'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-			'',
-			'',
-			''
-		);
+        // Get all available Solr cores.
+        $_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
+            'tx_dlf_solrcores',
+            'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+            '',
+            '',
+            ''
+        );
 
-		// Get all available collections.
-		$_collections = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_collections.label AS label,tx_dlf_collections.uid AS uid',
-			'tx_dlf_collections',
-			'tx_dlf_collections.fe_cruser_id=0 AND tx_dlf_collections.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_collections'),
-			'',
-			'tx_dlf_collections.label ASC',
-			''
-		);
+        // Get all available collections.
+        $_collections = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_collections.label AS label,tx_dlf_collections.uid AS uid',
+            'tx_dlf_collections',
+            'tx_dlf_collections.fe_cruser_id=0 AND tx_dlf_collections.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_collections'),
+            '',
+            'tx_dlf_collections.label ASC',
+            ''
+        );
 
-		// TODO: Ändern!
-		$form = '<label for="tx-dlf-modIndexing-id">Kollektion:</label>';
+        // TODO: Ändern!
+        $form = '<label for="tx-dlf-modIndexing-id">Kollektion:</label>';
 
-		$form .= '<select id="tx-dlf-modIndexing-collection" name="'.$this->prefixId.'[collection]">';
+        $form .= '<select id="tx-dlf-modIndexing-collection" name="'.$this->prefixId.'[collection]">';
 
-		$form .= '<option value="0">Alle</option>';
+        $form .= '<option value="0">Alle</option>';
 
-		while ($_collection = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_collections)) {
+        while ($_collection = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_collections)) {
 
-			$form .= '<option value="'.$_collection['uid'].'">'.htmlspecialchars($_collection['label']).'</option>';
+            $form .= '<option value="'.$_collection['uid'].'">'.htmlspecialchars($_collection['label']).'</option>';
 
-		}
+        }
 
-		$form .= '</select><br />';
+        $form .= '</select><br />';
 
-		$form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
+        $form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
 
-		$form .= '<option value="0">---</option>';
+        $form .= '<option value="0">---</option>';
 
-		while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
+        while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
 
-			$form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
+            $form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
 
-		}
+        }
 
-		$form .= '</select><br />';
+        $form .= '</select><br />';
 
-		$form .= '<input type="hidden" name="CMD" value="reindexDocs" />';
+        $form .= '<input type="hidden" name="CMD" value="reindexDocs" />';
 
-		$form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
+        $form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
 
-		return $form;
+        return $form;
 
-	}
+    }
 
-	/**
-	 * Builds HTML form for selecting a file
-	 *
-	 * @access	protected
-	 *
-	 * @return	string		The HTML output
-	 */
-	protected function getFileForm() {
+    /**
+     * Builds HTML form for selecting a file
+     *
+     * @access	protected
+     *
+     * @return	string		The HTML output
+     */
+    protected function getFileForm() {
 
-		// Get all available Solr cores.
-		$_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-			'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
-			'tx_dlf_solrcores',
-			'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
-			'',
-			'',
-			''
-		);
+        // Get all available Solr cores.
+        $_cores = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+            'tx_dlf_solrcores.label AS label,tx_dlf_solrcores.uid AS uid',
+            'tx_dlf_solrcores',
+            'tx_dlf_solrcores.pid IN (0,'.intval($this->id).')'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+            '',
+            '',
+            ''
+        );
 
-		// TODO: Ändern!
-		$form = '<label for="tx-dlf-modIndexing-id">METS-Datei:</label>';
+        // TODO: Ändern!
+        $form = '<label for="tx-dlf-modIndexing-id">METS-Datei:</label>';
 
-		$form .= '<input type="text" id="tx-dlf-modIndexing-id" name="'.$this->prefixId.'[id]" value="" /><br />';
+        $form .= '<input type="text" id="tx-dlf-modIndexing-id" name="'.$this->prefixId.'[id]" value="" /><br />';
 
-		$form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
+        $form .= '<select id="tx-dlf-modIndexing-core" name="'.$this->prefixId.'[core]">';
 
-		$form .= '<option value="0">---</option>';
+        $form .= '<option value="0">---</option>';
 
-		while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
+        while ($_core = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_cores)) {
 
-			$form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
+            $form .= '<option value="'.$_core['uid'].'">'.htmlspecialchars($_core['label']).'</option>';
 
-		}
+        }
 
-		$form .= '</select><br />';
+        $form .= '</select><br />';
 
-		$form .= '<input type="hidden" name="CMD" value="indexFile" />';
+        $form .= '<input type="hidden" name="CMD" value="indexFile" />';
 
-		$form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
+        $form .= '<input type="submit" name="'.$this->prefixId.'[submit]" value="'.$GLOBALS['LANG']->getLL('form.submit').'" />';
 
-		return $form;
+        return $form;
 
-	}
+    }
 
-	/**
-	 * Iterates through list of documents and indexes them
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function indexLoop() {
+    /**
+     * Iterates through list of documents and indexes them
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function indexLoop() {
 
-		// Get document from list.
-		list ($uid, $title) = $this->list->remove(0);
+        // Get document from list.
+        list ($uid, $title) = $this->list->remove(0);
 
-		$this->list->save();
+        $this->list->save();
 
-		// Save document to database and index.
-		$doc =& tx_dlf_document::getInstance($uid, 0, TRUE);
+        // Save document to database and index.
+        $doc =& tx_dlf_document::getInstance($uid, 0, TRUE);
 
-		if ($doc->ready) {
+        if ($doc->ready) {
 
-			$doc->save($doc->pid, $this->data['core']);
+            $doc->save($doc->pid, $this->data['core']);
 
-		}
+        }
 
-		// Give feedback about progress.
-		$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-			'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-			htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentsToGo'), count($this->list))),
-			tx_dlf_helper::getLL('flash.running', TRUE),
-			\TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-			TRUE
-		);
+        // Give feedback about progress.
+        $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+            htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.documentsToGo'), count($this->list))),
+            tx_dlf_helper::getLL('flash.running', TRUE),
+            \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
+            TRUE
+        );
 
-		$this->markerArray['CONTENT'] .= $_message->render();
+        $this->markerArray['CONTENT'] .= $_message->render();
 
-		// Start next loop.
-		$this->markerArray['CONTENT'] .= '<script type="text/javascript">window.location.href=unescape("'.\TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeJS(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'indexLoop', $this->prefixId => array ('core' => $this->data['core']), 'random' => uniqid())))).'");</script>';
+        // Start next loop.
+        $this->markerArray['CONTENT'] .= '<script type="text/javascript">window.location.href=unescape("'.\TYPO3\CMS\Core\Utility\GeneralUtility::rawUrlEncodeJS(\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'indexLoop', $this->prefixId => array ('core' => $this->data['core']), 'random' => uniqid())))).'");</script>';
 
-		$this->printContent();
+        $this->printContent();
 
-	}
+    }
 
-	/**
-	 * Main function of the module
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function main() {
+    /**
+     * Main function of the module
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function main() {
 
-		// Is the user allowed to access this page?
-		$access = is_array($this->pageInfo) || $GLOBALS['BE_USER']->isAdmin();
+        // Is the user allowed to access this page?
+        $access = is_array($this->pageInfo) || $GLOBALS['BE_USER']->isAdmin();
 
-		if ($this->id && $access) {
+        if ($this->id && $access) {
 
-			// Increase max_execution_time and max_input_time for large documents.
-			if (!ini_get('safe_mode')) {
+            // Increase max_execution_time and max_input_time for large documents.
+            if (!ini_get('safe_mode')) {
 
-				ini_set('max_execution_time', '0');
+                ini_set('max_execution_time', '0');
 
-				ini_set('max_input_time', '-1');
+                ini_set('max_input_time', '-1');
 
-			}
+            }
 
-			switch ($this->CMD) {
+            switch ($this->CMD) {
 
-				case 'indexFile':
+                case 'indexFile':
 
-					if (!empty($this->data['id']) && isset($this->data['core'])) {
+                    if (!empty($this->data['id']) && isset($this->data['core'])) {
 
-						// Save document to database and index.
-						$doc =& tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
+                        // Save document to database and index.
+                        $doc =& tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
 
-						if ($doc->ready) {
+                        if ($doc->ready) {
 
-							$doc->save($this->id, $this->data['core']);
+                            $doc->save($this->id, $this->data['core']);
 
-						} else {
+                        } else {
 
-							$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-								'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-								htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.fileNotLoaded'), $this->data['id'])),
-								tx_dlf_helper::getLL('flash.error', TRUE),
-								\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-								TRUE
-							);
+                            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                                htmlspecialchars(sprintf(tx_dlf_helper::getLL('flash.fileNotLoaded'), $this->data['id'])),
+                                tx_dlf_helper::getLL('flash.error', TRUE),
+                                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                                TRUE
+                            );
 
-							tx_dlf_helper::addMessage($_message);
+                            tx_dlf_helper::addMessage($_message);
 
-						}
+                        }
 
-					}
+                    }
 
-					break;
+                    break;
 
-				case 'reindexDocs':
+                case 'reindexDocs':
 
-					if (isset($this->data['core'])) {
+                    if (isset($this->data['core'])) {
 
-						if (!empty($this->data['collection'])) {
+                        if (!empty($this->data['collection'])) {
 
-							// Get all documents in this collection.
-							$_result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
-								'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
-								'tx_dlf_documents',
-								'tx_dlf_relations',
-								'tx_dlf_collections',
-								'AND tx_dlf_documents.pid='.intval($this->id).' AND tx_dlf_collections.uid='.intval($this->data['collection']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
-								'tx_dlf_documents.uid',
-								'',
-								''
-							);
+                            // Get all documents in this collection.
+                            $_result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+                                'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
+                                'tx_dlf_documents',
+                                'tx_dlf_relations',
+                                'tx_dlf_collections',
+                                'AND tx_dlf_documents.pid='.intval($this->id).' AND tx_dlf_collections.uid='.intval($this->data['collection']).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                                'tx_dlf_documents.uid',
+                                '',
+                                ''
+                            );
 
-						} else {
+                        } else {
 
-							// Get all documents.
-							$_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-								'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
-								'tx_dlf_documents',
-								'tx_dlf_documents.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_documents'),
-								'',
-								'',
-								''
-							);
+                            // Get all documents.
+                            $_result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                                'tx_dlf_documents.title AS title,tx_dlf_documents.uid AS uid',
+                                'tx_dlf_documents',
+                                'tx_dlf_documents.pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_documents'),
+                                '',
+                                '',
+                                ''
+                            );
 
-						}
+                        }
 
-						// Save them as a list object in user's session.
-						$elements = array ();
+                        // Save them as a list object in user's session.
+                        $elements = array ();
 
-						while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
+                        while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($_result)) {
 
-							$elements[] = array ($resArray['uid'], $resArray['title']);
+                            $elements[] = array ($resArray['uid'], $resArray['title']);
 
-						}
+                        }
 
-						$this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list', $elements);
+                        $this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list', $elements);
 
-						// Start index looping.
-						if (count($this->list) > 0) {
+                        // Start index looping.
+                        if (count($this->list) > 0) {
 
-							$this->indexLoop();
+                            $this->indexLoop();
 
-						}
+                        }
 
-					}
+                    }
 
-					break;
+                    break;
 
-				case 'indexLoop':
+                case 'indexLoop':
 
-					// Refresh user's session to prevent session timeout.
-					$GLOBALS['BE_USER']->fetchUserSession();
+                    // Refresh user's session to prevent session timeout.
+                    $GLOBALS['BE_USER']->fetchUserSession();
 
-					// Get document list from user's session.
-					$this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
+                    // Get document list from user's session.
+                    $this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
 
-					// Continue index looping.
-					if (count($this->list) > 0 && isset($this->data['core'])) {
+                    // Continue index looping.
+                    if (count($this->list) > 0 && isset($this->data['core'])) {
 
-						$this->indexLoop();
+                        $this->indexLoop();
 
-					} else {
+                    } else {
 
-						$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-							'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-							tx_dlf_helper::getLL('flash.seeLog', TRUE),
-							tx_dlf_helper::getLL('flash.done', TRUE),
-							\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-							TRUE
-						);
+                        $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                            'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                            tx_dlf_helper::getLL('flash.seeLog', TRUE),
+                            tx_dlf_helper::getLL('flash.done', TRUE),
+                            \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                            TRUE
+                        );
 
-						tx_dlf_helper::addMessage($_message);
+                        tx_dlf_helper::addMessage($_message);
 
-					}
+                    }
 
-					break;
+                    break;
 
-			}
+            }
 
 
-			$this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
+            $this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
 
-			switch ($this->MOD_SETTINGS['function']) {
+            switch ($this->MOD_SETTINGS['function']) {
 
-				case 'indexFile':
+                case 'indexFile':
 
-					$this->markerArray['CONTENT'] .= $this->getFileForm();
+                    $this->markerArray['CONTENT'] .= $this->getFileForm();
 
-					break;
+                    break;
 
-				case 'reindexDoc':
+                case 'reindexDoc':
 
-					$this->markerArray['CONTENT'] .= $this->getDocList();
+                    $this->markerArray['CONTENT'] .= $this->getDocList();
 
-					break;
+                    break;
 
-				case 'reindexDocs':
+                case 'reindexDocs':
 
-					$this->markerArray['CONTENT'] .= $this->getCollList();
+                    $this->markerArray['CONTENT'] .= $this->getCollList();
 
-					break;
+                    break;
 
-			}
+            }
 
-		} else {
+        } else {
 
-			// TODO: Ändern!
-			$this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
+            // TODO: Ändern!
+            $this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
 
-		}
+        }
 
-		$this->printContent();
+        $this->printContent();
 
-	}
+    }
 
-	/**
-	 * Sets the module's MOD_MENU configuration
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function setMOD_MENU() {
+    /**
+     * Sets the module's MOD_MENU configuration
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function setMOD_MENU() {
 
-		$this->MOD_MENU = array (
-			'function' => array (
-				'indexFile' => $GLOBALS['LANG']->getLL('function.indexFile'),
-				//'reindexDoc' => $GLOBALS['LANG']->getLL('function.reindexDoc'),
-				'reindexDocs' => $GLOBALS['LANG']->getLL('function.reindexDocs'),
-			)
-		);
+        $this->MOD_MENU = array (
+            'function' => array (
+                'indexFile' => $GLOBALS['LANG']->getLL('function.indexFile'),
+                //'reindexDoc' => $GLOBALS['LANG']->getLL('function.reindexDoc'),
+                'reindexDocs' => $GLOBALS['LANG']->getLL('function.reindexDocs'),
+            )
+        );
 
-	}
+    }
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -162,7 +162,7 @@ 
 		$this->list->save();
 
 		// Save document to database and index.
-		$doc =& tx_dlf_document::getInstance($uid, 0, TRUE);
+		$doc = & tx_dlf_document::getInstance($uid, 0, TRUE);
 
 		if ($doc->ready) {
 
@@ -218,7 +218,7 @@ 
 					if (!empty($this->data['id']) && isset($this->data['core'])) {
 
 						// Save document to database and index.
-						$doc =& tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
+						$doc = & tx_dlf_document::getInstance($this->data['id'], $this->id, TRUE);
 
 						if ($doc->ready) {
 

dlf/modules/newclient/index.php

Indentation +382 added lines, -382 removed lines

@@ -19,489 +19,489 @@
  */
 class tx_dlf_modNewclient extends tx_dlf_module {
 
-	protected $modPath = 'newclient/';
+    protected $modPath = 'newclient/';
 
-	protected $buttonArray = array (
-		'SHORTCUT' => '',
-	);
+    protected $buttonArray = array (
+        'SHORTCUT' => '',
+    );
 
-	protected $markerArray = array (
-		'CSH' => '',
-		'MOD_MENU' => '',
-		'CONTENT' => '',
-	);
+    protected $markerArray = array (
+        'CSH' => '',
+        'MOD_MENU' => '',
+        'CONTENT' => '',
+    );
 
-	/**
-	 * Add access rights
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function cmdAddAccessRights() {
+    /**
+     * Add access rights
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function cmdAddAccessRights() {
 
-		// Get command line indexer's usergroup.
-		$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'uid,db_mountpoints',
-				'be_groups',
-				'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
-		);
+        // Get command line indexer's usergroup.
+        $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'uid,db_mountpoints',
+                'be_groups',
+                'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
+        );
 
-		if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+        if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-			$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+            $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-			// Add current page to mountpoints.
-			if (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
+            // Add current page to mountpoints.
+            if (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
 
-				$data['be_groups'][$resArray['uid']]['db_mountpoints'] = $resArray['db_mountpoints'].','.$this->id;
+                $data['be_groups'][$resArray['uid']]['db_mountpoints'] = $resArray['db_mountpoints'].','.$this->id;
 
-				tx_dlf_helper::processDBasAdmin($data);
+                tx_dlf_helper::processDBasAdmin($data);
 
-				// Fine.
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					tx_dlf_helper::getLL('flash.usergroupAddedMsg'),
-					tx_dlf_helper::getLL('flash.usergroupAdded', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-					FALSE
-				);
+                // Fine.
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    tx_dlf_helper::getLL('flash.usergroupAddedMsg'),
+                    tx_dlf_helper::getLL('flash.usergroupAdded', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                    FALSE
+                );
 
-				tx_dlf_helper::addMessage($_message);
+                tx_dlf_helper::addMessage($_message);
 
-			}
+            }
 
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Add metadata configuration
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function cmdAddMetadata() {
+    /**
+     * Add metadata configuration
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function cmdAddMetadata() {
 
-		// Include metadata definition file.
-		include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'metadata.inc.php');
-
-		$i = 0;
+        // Include metadata definition file.
+        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'metadata.inc.php');
+
+        $i = 0;
 
-		// Build data array.
-		foreach ($metadata as $index_name => $values) {
+        // Build data array.
+        foreach ($metadata as $index_name => $values) {
 
-			$formatIds = array ();
+            $formatIds = array ();
 
-			foreach ($values['format'] as $format) {
-
-				$formatIds[] = uniqid('NEW');
-
-				$data['tx_dlf_metadataformat'][end($formatIds)] = $format;
-
-				$data['tx_dlf_metadataformat'][end($formatIds)]['pid'] = intval($this->id);
+            foreach ($values['format'] as $format) {
+
+                $formatIds[] = uniqid('NEW');
+
+                $data['tx_dlf_metadataformat'][end($formatIds)] = $format;
+
+                $data['tx_dlf_metadataformat'][end($formatIds)]['pid'] = intval($this->id);
 
-				$i++;
+                $i++;
 
-			}
+            }
 
-			$data['tx_dlf_metadata'][uniqid('NEW')] = array (
-				'pid' => intval($this->id),
-				'label' => $GLOBALS['LANG']->getLL($index_name),
-				'index_name' => $index_name,
-				'format' => implode(',', $formatIds),
-				'default_value' => $values['default_value'],
-				'wrap' => (!empty($values['wrap']) ? $values['wrap'] : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']),
-				'index_tokenized' => $values['index_tokenized'],
-				'index_stored' => $values['index_stored'],
-				'index_indexed' => $values['index_indexed'],
-				'index_boost' => $values['index_boost'],
-				'is_sortable' => $values['is_sortable'],
-				'is_facet' => $values['is_facet'],
-				'is_listed' => $values['is_listed'],
-				'index_autocomplete' => $values['index_autocomplete'],
-			);
-
-			$i++;
-
-		}
-
-		$_ids = tx_dlf_helper::processDBasAdmin($data);
-
-		// Check for failed inserts.
-		if (count($_ids) == $i) {
-
-			// Fine.
-			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				tx_dlf_helper::getLL('flash.metadataAddedMsg'),
-				tx_dlf_helper::getLL('flash.metadataAdded', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-				FALSE
-			);
+            $data['tx_dlf_metadata'][uniqid('NEW')] = array (
+                'pid' => intval($this->id),
+                'label' => $GLOBALS['LANG']->getLL($index_name),
+                'index_name' => $index_name,
+                'format' => implode(',', $formatIds),
+                'default_value' => $values['default_value'],
+                'wrap' => (!empty($values['wrap']) ? $values['wrap'] : $GLOBALS['TCA']['tx_dlf_metadata']['columns']['wrap']['config']['default']),
+                'index_tokenized' => $values['index_tokenized'],
+                'index_stored' => $values['index_stored'],
+                'index_indexed' => $values['index_indexed'],
+                'index_boost' => $values['index_boost'],
+                'is_sortable' => $values['is_sortable'],
+                'is_facet' => $values['is_facet'],
+                'is_listed' => $values['is_listed'],
+                'index_autocomplete' => $values['index_autocomplete'],
+            );
+
+            $i++;
+
+        }
+
+        $_ids = tx_dlf_helper::processDBasAdmin($data);
+
+        // Check for failed inserts.
+        if (count($_ids) == $i) {
+
+            // Fine.
+            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                tx_dlf_helper::getLL('flash.metadataAddedMsg'),
+                tx_dlf_helper::getLL('flash.metadataAdded', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                FALSE
+            );
 
-		} else {
+        } else {
 
-			// Something went wrong.
-			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				tx_dlf_helper::getLL('flash.metadataNotAddedMsg'),
-				tx_dlf_helper::getLL('flash.metadataNotAdded', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-				FALSE
-			);
-
-		}
-
-		tx_dlf_helper::addMessage($_message);
-
-	}
-
-	/**
-	 * Add Solr core
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function cmdAddSolrCore() {
+            // Something went wrong.
+            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                tx_dlf_helper::getLL('flash.metadataNotAddedMsg'),
+                tx_dlf_helper::getLL('flash.metadataNotAdded', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                FALSE
+            );
+
+        }
+
+        tx_dlf_helper::addMessage($_message);
+
+    }
+
+    /**
+     * Add Solr core
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function cmdAddSolrCore() {
 
-		// Build data array.
-		$data['tx_dlf_solrcores'][uniqid('NEW')] = array (
-			'pid' => intval($this->id),
-			'label' => $GLOBALS['LANG']->getLL('solrcore').' (PID '.$this->id.')',
-			'index_name' => '',
-		);
-
-		$_ids = tx_dlf_helper::processDBasAdmin($data);
-
-		// Check for failed inserts.
-		if (count($_ids) == 1) {
-
-			// Fine.
-			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				tx_dlf_helper::getLL('flash.solrcoreAddedMsg'),
-				tx_dlf_helper::getLL('flash.solrcoreAdded', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-				FALSE
-			);
-
-		} else {
-
-			// Something went wrong.
-			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				tx_dlf_helper::getLL('flash.solrcoreNotAddedMsg'),
-				tx_dlf_helper::getLL('flash.solrcoreNotAdded', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-				FALSE
-			);
-
-		}
-
-		tx_dlf_helper::addMessage($_message);
-
-	}
-
-	/**
-	 * Add structure configuration
-	 *
-	 * @access	protected
-	 *
-	 * @return	void
-	 */
-	protected function cmdAddStructure() {
+        // Build data array.
+        $data['tx_dlf_solrcores'][uniqid('NEW')] = array (
+            'pid' => intval($this->id),
+            'label' => $GLOBALS['LANG']->getLL('solrcore').' (PID '.$this->id.')',
+            'index_name' => '',
+        );
+
+        $_ids = tx_dlf_helper::processDBasAdmin($data);
+
+        // Check for failed inserts.
+        if (count($_ids) == 1) {
+
+            // Fine.
+            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                tx_dlf_helper::getLL('flash.solrcoreAddedMsg'),
+                tx_dlf_helper::getLL('flash.solrcoreAdded', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                FALSE
+            );
+
+        } else {
+
+            // Something went wrong.
+            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                tx_dlf_helper::getLL('flash.solrcoreNotAddedMsg'),
+                tx_dlf_helper::getLL('flash.solrcoreNotAdded', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                FALSE
+            );
+
+        }
+
+        tx_dlf_helper::addMessage($_message);
+
+    }
+
+    /**
+     * Add structure configuration
+     *
+     * @access	protected
+     *
+     * @return	void
+     */
+    protected function cmdAddStructure() {
 
-		// Include structure definition file.
-		include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'structures.inc.php');
+        // Include structure definition file.
+        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'structures.inc.php');
 
-		// Build data array.
-		foreach ($structures as $index_name => $values) {
+        // Build data array.
+        foreach ($structures as $index_name => $values) {
 
-			$data['tx_dlf_structures'][uniqid('NEW')] = array (
-				'pid' => intval($this->id),
-				'toplevel' => $values['toplevel'],
-				'label' => $GLOBALS['LANG']->getLL($index_name),
-				'index_name' => $index_name,
-				'oai_name' => $values['oai_name'],
-				'thumbnail' => 0,
-			);
+            $data['tx_dlf_structures'][uniqid('NEW')] = array (
+                'pid' => intval($this->id),
+                'toplevel' => $values['toplevel'],
+                'label' => $GLOBALS['LANG']->getLL($index_name),
+                'index_name' => $index_name,
+                'oai_name' => $values['oai_name'],
+                'thumbnail' => 0,
+            );
 
-		}
-
-		$_ids = tx_dlf_helper::processDBasAdmin($data);
-
-		// Check for failed inserts.
-		if (count($_ids) == count($structures)) {
+        }
+
+        $_ids = tx_dlf_helper::processDBasAdmin($data);
+
+        // Check for failed inserts.
+        if (count($_ids) == count($structures)) {
 
-			// Fine.
-			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				tx_dlf_helper::getLL('flash.structureAddedMsg'),
-				tx_dlf_helper::getLL('flash.structureAdded', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-				FALSE
-			);
+            // Fine.
+            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                tx_dlf_helper::getLL('flash.structureAddedMsg'),
+                tx_dlf_helper::getLL('flash.structureAdded', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                FALSE
+            );
 
-		} else {
+        } else {
 
-			// Something went wrong.
-			$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-				'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-				tx_dlf_helper::getLL('flash.structureNotAddedMsg'),
-				tx_dlf_helper::getLL('flash.structureNotAdded', TRUE),
-				\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-				FALSE
-			);
+            // Something went wrong.
+            $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                tx_dlf_helper::getLL('flash.structureNotAddedMsg'),
+                tx_dlf_helper::getLL('flash.structureNotAdded', TRUE),
+                \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                FALSE
+            );
 
-		}
+        }
 
-		tx_dlf_helper::addMessage($_message);
+        tx_dlf_helper::addMessage($_message);
 
-	}
+    }
 
-	/**
-	 * Main function of the module
-	 *
-	 * @access	public
-	 *
-	 * @return	void
-	 */
-	public function main() {
+    /**
+     * Main function of the module
+     *
+     * @access	public
+     *
+     * @return	void
+     */
+    public function main() {
 
-		// Is the user allowed to access this page?
-		$access = is_array($this->pageInfo) && $GLOBALS['BE_USER']->isAdmin();
+        // Is the user allowed to access this page?
+        $access = is_array($this->pageInfo) && $GLOBALS['BE_USER']->isAdmin();
 
-		if ($this->id && $access) {
+        if ($this->id && $access) {
 
-			// Check if page is sysfolder.
-			if ($this->pageInfo['doktype'] != 254) {
+            // Check if page is sysfolder.
+            if ($this->pageInfo['doktype'] != 254) {
 
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					tx_dlf_helper::getLL('flash.wrongPageTypeMsg'),
-					tx_dlf_helper::getLL('flash.wrongPageType', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-					FALSE
-				);
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    tx_dlf_helper::getLL('flash.wrongPageTypeMsg'),
+                    tx_dlf_helper::getLL('flash.wrongPageType', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                    FALSE
+                );
 
-				tx_dlf_helper::addMessage($_message);
+                tx_dlf_helper::addMessage($_message);
 
-				$this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
+                $this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
 
-				$this->printContent();
+                $this->printContent();
 
-				return;
+                return;
 
-			}
+            }
 
-			// Should we do something?
-			if (!empty($this->CMD)) {
+            // Should we do something?
+            if (!empty($this->CMD)) {
 
-				// Sanitize input...
-				$_method = 'cmd'.ucfirst($this->CMD);
+                // Sanitize input...
+                $_method = 'cmd'.ucfirst($this->CMD);
 
-				// ...and unset to prevent infinite looping.
-				unset ($this->CMD);
+                // ...and unset to prevent infinite looping.
+                unset ($this->CMD);
 
-				if (method_exists($this, $_method)) {
+                if (method_exists($this, $_method)) {
 
-					$this->$_method();
+                    $this->$_method();
 
-				}
+                }
 
-			}
+            }
 
-			// Check for existing structure configuration.
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'uid',
-				'tx_dlf_structures',
-				'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_structures')
-			);
+            // Check for existing structure configuration.
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'uid',
+                'tx_dlf_structures',
+                'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_structures')
+            );
 
-			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-				// Fine.
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					tx_dlf_helper::getLL('flash.structureOkayMsg'),
-					tx_dlf_helper::getLL('flash.structureOkay', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-					FALSE
-				);
+                // Fine.
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    tx_dlf_helper::getLL('flash.structureOkayMsg'),
+                    tx_dlf_helper::getLL('flash.structureOkay', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                    FALSE
+                );
 
-			} else {
+            } else {
 
-				// Configuration missing.
-				$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addStructure')));
+                // Configuration missing.
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addStructure')));
 
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					sprintf(tx_dlf_helper::getLL('flash.structureNotOkayMsg'), $_url),
-					tx_dlf_helper::getLL('flash.structureNotOkay', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-					FALSE
-				);
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    sprintf(tx_dlf_helper::getLL('flash.structureNotOkayMsg'), $_url),
+                    tx_dlf_helper::getLL('flash.structureNotOkay', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                    FALSE
+                );
 
-			}
+            }
 
-			tx_dlf_helper::addMessage($_message);
+            tx_dlf_helper::addMessage($_message);
 
-			// Check for existing metadata configuration.
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'uid',
-				'tx_dlf_metadata',
-				'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_metadata')
-			);
+            // Check for existing metadata configuration.
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'uid',
+                'tx_dlf_metadata',
+                'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_metadata')
+            );
 
-			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-				// Fine.
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					tx_dlf_helper::getLL('flash.metadataOkayMsg'),
-					tx_dlf_helper::getLL('flash.metadataOkay', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-					FALSE
-				);
+                // Fine.
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    tx_dlf_helper::getLL('flash.metadataOkayMsg'),
+                    tx_dlf_helper::getLL('flash.metadataOkay', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                    FALSE
+                );
 
-			} else {
+            } else {
 
-				// Configuration missing.
-				$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addMetadata')));
+                // Configuration missing.
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addMetadata')));
 
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					sprintf(tx_dlf_helper::getLL('flash.metadataNotOkayMsg'), $_url),
-					tx_dlf_helper::getLL('flash.metadataNotOkay', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-					FALSE
-				);
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    sprintf(tx_dlf_helper::getLL('flash.metadataNotOkayMsg'), $_url),
+                    tx_dlf_helper::getLL('flash.metadataNotOkay', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                    FALSE
+                );
 
-			}
+            }
 
-			tx_dlf_helper::addMessage($_message);
+            tx_dlf_helper::addMessage($_message);
 
-			// Check the access conditions for the command line indexer's user.
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'uid,db_mountpoints',
-				'be_groups',
-				'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
-			);
+            // Check the access conditions for the command line indexer's user.
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'uid,db_mountpoints',
+                'be_groups',
+                'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
+            );
 
-			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+                $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-				if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
+                if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
 
-					// Fine.
-					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						tx_dlf_helper::getLL('flash.usergroupOkayMsg'),
-						tx_dlf_helper::getLL('flash.usergroupOkay', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-						FALSE
-					);
+                    // Fine.
+                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        tx_dlf_helper::getLL('flash.usergroupOkayMsg'),
+                        tx_dlf_helper::getLL('flash.usergroupOkay', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                        FALSE
+                    );
 
-				} else {
+                } else {
 
-					// Configuration missing.
-					$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addAccessRights')));
+                    // Configuration missing.
+                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addAccessRights')));
 
-					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						sprintf(tx_dlf_helper::getLL('flash.usergroupNotOkayMsg'), $_url),
-						tx_dlf_helper::getLL('flash.usergroupNotOkay', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-						FALSE
-					);
+                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        sprintf(tx_dlf_helper::getLL('flash.usergroupNotOkayMsg'), $_url),
+                        tx_dlf_helper::getLL('flash.usergroupNotOkay', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                        FALSE
+                    );
 
-				}
+                }
 
-			} else {
+            } else {
 
-				// Usergoup missing.
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					tx_dlf_helper::getLL('flash.usergroupMissingMsg'),
-					tx_dlf_helper::getLL('flash.usergroupMissing', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-					FALSE
-				);
+                // Usergoup missing.
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    tx_dlf_helper::getLL('flash.usergroupMissingMsg'),
+                    tx_dlf_helper::getLL('flash.usergroupMissing', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
+                    FALSE
+                );
 
-			}
+            }
 
-			tx_dlf_helper::addMessage($_message);
+            tx_dlf_helper::addMessage($_message);
 
-			// Check for existing Solr core.
-			$result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-				'uid,pid',
-				'tx_dlf_solrcores',
-				'pid IN ('.intval($this->id).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores')
-			);
+            // Check for existing Solr core.
+            $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                'uid,pid',
+                'tx_dlf_solrcores',
+                'pid IN ('.intval($this->id).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores')
+            );
 
-			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
+            if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-				$resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
+                $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
-				if ($resArray['pid']) {
+                if ($resArray['pid']) {
 
-					// Fine.
-					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						tx_dlf_helper::getLL('flash.solrcoreOkayMsg'),
-						tx_dlf_helper::getLL('flash.solrcoreOkay', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-						FALSE
-					);
+                    // Fine.
+                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        tx_dlf_helper::getLL('flash.solrcoreOkayMsg'),
+                        tx_dlf_helper::getLL('flash.solrcoreOkay', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
+                        FALSE
+                    );
 
-				} else {
+                } else {
 
-					// Default core available, but this is deprecated.
-					$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+                    // Default core available, but this is deprecated.
+                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
 
-					$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-						'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-						sprintf(tx_dlf_helper::getLL('flash.solrcoreDeprecatedMsg'), $_url),
-						tx_dlf_helper::getLL('flash.solrcoreDeprecatedOkay', TRUE),
-						\TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE,
-						FALSE
-					);
+                    $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                        sprintf(tx_dlf_helper::getLL('flash.solrcoreDeprecatedMsg'), $_url),
+                        tx_dlf_helper::getLL('flash.solrcoreDeprecatedOkay', TRUE),
+                        \TYPO3\CMS\Core\Messaging\FlashMessage::NOTICE,
+                        FALSE
+                    );
 
-				}
+                }
 
-			} else {
+            } else {
 
-				// Solr core missing.
-				$_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+                // Solr core missing.
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
 
-				$_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-					'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-					sprintf(tx_dlf_helper::getLL('flash.solrcoreMissingMsg'), $_url),
-					tx_dlf_helper::getLL('flash.solrcoreMissing', TRUE),
-					\TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-					FALSE
-				);
+                $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    sprintf(tx_dlf_helper::getLL('flash.solrcoreMissingMsg'), $_url),
+                    tx_dlf_helper::getLL('flash.solrcoreMissing', TRUE),
+                    \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
+                    FALSE
+                );
 
-			}
+            }
 
-			tx_dlf_helper::addMessage($_message);
+            tx_dlf_helper::addMessage($_message);
 
-			$this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
+            $this->markerArray['CONTENT'] .= tx_dlf_helper::renderFlashMessages();
 
-		} else {
+        } else {
 
-			// TODO: Ändern!
-			$this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
+            // TODO: Ändern!
+            $this->markerArray['CONTENT'] .= 'You are not allowed to access this page or have not selected a page, yet.';
 
-		}
+        }
 
-		$this->printContent();
+        $this->printContent();
 
-	}
+    }
 
 }