[Fmsystem-commits] [10468] API: yui3::combo-master

[Sigurd Nes]

Revision: 10468
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10468
Author:   sigurdne
Date:     2012-11-05 08:38:35 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
API: yui3::combo-master

Modified Paths:
--------------
    trunk/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
    trunk/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
    trunk/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php

Modified: trunk/phpgwapi/inc/yui-combo-master/lib/YUICombo.php
===================================================================
--- trunk/phpgwapi/inc/yui-combo-master/lib/YUICombo.php        2012-11-05 
08:26:24 UTC (rev 10467)
+++ trunk/phpgwapi/inc/yui-combo-master/lib/YUICombo.php        2012-11-05 
08:38:35 UTC (rev 10468)
@@ -52,7 +52,7 @@
                $config = $this->getConfig();
                $cache = $config["cache"];
                $cacheCombo = $config["cacheCombo"];
-               $gzip = $config["gzip"];
+               $gzip = function_exists('gzencode') ? $config["gzip"] : false;
 
                $filemtimes = EMPTY_STRING;
                $query = $_SERVER["QUERY_STRING"].("gzip=".$gzip);
@@ -98,7 +98,7 @@
                $config = $this->getConfig();
                $cache = $config["cache"];
                $cacheCombo = $config["cacheCombo"];
-               $gzip = $config["gzip"];
+               $gzip = function_exists('gzencode') ? $config["gzip"] : false;
 
                $this->REQUEST_CACHE_ID = $this->getRequestId();
 

Modified: trunk/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php
===================================================================
--- trunk/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php     2012-11-05 
08:26:24 UTC (rev 10467)
+++ trunk/phpgwapi/inc/yui-combo-master/lib/YUIFileUtil.php     2012-11-05 
08:38:35 UTC (rev 10468)
@@ -32,7 +32,7 @@
            return false;
        }
 
-       function writeCache($id, $content) {
+       public static function writeCache($id, $content) {
                if (!is_dir(TEMP_DIR)) {
                        mkdir(TEMP_DIR, 0777);
                }
@@ -40,7 +40,7 @@
                file_put_contents(TEMP_DIR.DS.$id, $content);
        }
 
-       function getCache($id) {
+       public static function getCache($id) {
                $file = TEMP_DIR.DS.$id;
 
                if (is_file($file)) {

Modified: trunk/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php
===================================================================
--- trunk/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php   2012-11-05 
08:26:24 UTC (rev 10467)
+++ trunk/phpgwapi/inc/yui-combo-master/lib/YUIHeaderUtil.php   2012-11-05 
08:38:35 UTC (rev 10468)
@@ -1,14 +1,14 @@
 <?php
 class YUIHeaderUtil {
-       public function setAge($age = 0) {
+       public static function setAge($age = 0) {
                header("Age: $age");
        }
 
-       public function setCacheControl($cacheControl = "max-age=315360000") {
+       public static function setCacheControl($cacheControl = 
"max-age=315360000") {
                header("Cache-Control: $cacheControl");
        }
 
-       public function setContentLength($bytes) {
+       public static function setContentLength($bytes) {
                header("Content-Length: $bytes");
        }
 
@@ -16,7 +16,7 @@
                header("Content-Type: ".$mimetype);
        }
 
-       public function setExpires() {
+       public static function setExpires() {
                header("Expires: " . @date("r", @mktime() + (60 * 60 * 24 * 365 
* 10)));
        }
 
@@ -24,8 +24,8 @@
                header("HTTP/1.1 403 Forbidden");
        }
 
-       public function setGzip() {
+       public static function setGzip() {
                header("Content-Encoding: gzip");
        }
 }
-?>
\ No newline at end of file
+?>