Merged ImageFunctions.php into GlobalFunctions.php

[lhc/web/wiklou.git] / includes / AjaxResponse.php

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index b9f8085..a395239 100644 (file)
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -34,6 +34,9 @@ class AjaxResponse {
        /** Content of our HTTP response */
        private $mText;
 
+       /**
+        * @param $text string|null
+        */
        function __construct( $text = null ) {
                $this->mCacheDuration = null;
                $this->mVary = null;
@@ -69,21 +72,28 @@ class AjaxResponse {
                $this->mDisabled = true;
        }
 
-       /** Add content to the response */
+       /**
+        * Add content to the response
+        * @param $text string
+        */
        function addText( $text ) {
                if ( ! $this->mDisabled && $text ) {
                        $this->mText .= $text;
                }
        }
 
-       /** Output text */
+       /**
+        * Output text
+        */
        function printText() {
                if ( ! $this->mDisabled ) {
                        print $this->mText;
                }
        }
 
-       /** Construct the header and output it */
+       /**
+        * Construct the header and output it
+        */
        function sendHeaders() {
                global $wgUseSquid, $wgUseESI;
 
@@ -139,8 +149,10 @@ class AjaxResponse {
        /**
         * checkLastModified tells the client to use the client-cached response if
         * possible. If sucessful, the AjaxResponse is disabled so that
-        * any future call to AjaxResponse::printText() have no effect. The method
-        * returns true iff the response code was set to 304 Not Modified.
+        * any future call to AjaxResponse::printText() have no effect.
+        *
+        * @param $timestamp string
+        * @return bool Returns true if the response code was set to 304 Not Modified.
         */
        function checkLastModified ( $timestamp ) {
                global $wgCachePages, $wgCacheEpoch, $wgUser;
@@ -148,21 +160,21 @@ class AjaxResponse {
 
                if ( !$timestamp || $timestamp == '19700101000000' ) {
                        wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP\n" );
-                       return;
+                       return false;
                }
 
                if ( !$wgCachePages ) {
                        wfDebug( "$fname: CACHE DISABLED\n", false );
-                       return;
+                       return false;
                }
 
                if ( $wgUser->getOption( 'nocache' ) ) {
                        wfDebug( "$fname: USER DISABLED CACHE\n", false );
-                       return;
+                       return false;
                }
 
                $timestamp = wfTimestamp( TS_MW, $timestamp );
-               $lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->mTouched, $wgCacheEpoch ) );
+               $lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->getTouched(), $wgCacheEpoch ) );
 
                if ( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
                        # IE sends sizes after the date like this:
@@ -180,19 +192,25 @@ class AjaxResponse {
                                $this->disable();
                                $this->mLastModified = $lastmod;
 
-                               wfDebug( "$fname: CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
+                               wfDebug( "$fname: CACHED client: $ismodsince ; user: {$wgUser->getTouched()} ; page: $timestamp ; site $wgCacheEpoch\n", false );
 
                                return true;
                        } else {
-                               wfDebug( "$fname: READY  client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
+                               wfDebug( "$fname: READY  client: $ismodsince ; user: {$wgUser->getTouched()} ; page: $timestamp ; site $wgCacheEpoch\n", false );
                                $this->mLastModified = $lastmod;
                        }
                } else {
                        wfDebug( "$fname: client did not send If-Modified-Since header\n", false );
                        $this->mLastModified = $lastmod;
                }
+               return false;
        }
 
+       /**
+        * @param $mckey
+        * @param $touched
+        * @return bool
+        */
        function loadFromMemcached( $mckey, $touched ) {
                global $wgMemc;
 
@@ -216,6 +234,11 @@ class AjaxResponse {
                return false;
        }
 
+       /**
+        * @param $mckey
+        * @param $expiry int
+        * @return bool
+        */
        function storeInMemcached( $mckey, $expiry = 86400 ) {
                global $wgMemc;