Bladeren bron

Update cache.php

FusionPBX 6 jaren geleden
bovenliggende
commit
79f730dd29
1 gewijzigde bestanden met toevoegingen van 48 en 32 verwijderingen
  1. 48 32
      resources/classes/cache.php

+ 48 - 32
resources/classes/cache.php

@@ -33,20 +33,30 @@ class cache {
 	 * @var string $value	string to be cached
 	 */
 	public function set($key, $value) {
-		// connect to event socket
-			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-			if ($fp === false) {
-				return false;
+		//save to memcache
+			if ($_SESSION['cache']['method']['text'] == "memcache") {
+				//connect to event socket
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp === false) {
+						return false;
+					}
+		
+				//send a custom event
+		
+				//run the memcache
+					$command = "memcache set ".$key." ".$value;
+					$result = event_socket_request($fp, 'api '.$command);
+		
+				//close event socket
+					fclose($fp);
 			}
 
-		//send a custom event
-
-		//run the memcache
-			$command = "memcache set ".$key." ".$value;
-			$result = event_socket_request($fp, 'api '.$command);
-
-		//close event socket
-			fclose($fp);
+		//save to the file cache
+			if ($_SESSION['cache']['method']['text'] == "file") {
+				if (file_exists($_SESSION['cache']['location']['text'] . "/" . $key)) {
+					$result = file_put_contents($_SESSION['cache']['location']['text'] . "/" . $key, $value);
+				}
+			}
 
 		// return result
 			return $result;
@@ -57,21 +67,33 @@ class cache {
 	 * @var string $key		cache id
 	 */
 	public function get($key) {
-		// connect to event socket
-			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-			if ($fp === false) {
-				return false;
+		
+		//cache method memcache 
+			if ($_SESSION['cache']['method']['text'] == "memcache") {
+				// connect to event socket
+					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+					if ($fp === false) {
+						return false;
+					}
+		
+				//send a custom event
+		
+				//run the memcache
+					$command = "memcache get ".$key;
+					$result = event_socket_request($fp, 'api '.$command);
+		
+				//close event socket
+					fclose($fp);
+		
 			}
-
-		//send a custom event
-
-		//run the memcache
-			$command = "memcache get ".$key;
-			$result = event_socket_request($fp, 'api '.$command);
-
-		//close event socket
-			fclose($fp);
-
+		
+		//get the file cache
+			if ($_SESSION['cache']['method']['text'] == "file") {
+				if (file_exists($_SESSION['cache']['location']['text'] . "/" . $key)) {
+					$result = file_get_contents($_SESSION['cache']['location']['text'] . "/" . $key);
+				}
+			}
+	
 		// return result
 			return $result;
 	}
@@ -170,12 +192,6 @@ class cache {
 
 		//cache method file 
 			if ($_SESSION['cache']['method']['text'] == "file") {
-				// connect to event socket
-					$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-					if ($fp === false) {
-						return false;
-					}
-
 				//send a custom event
 					$event = "sendevent CUSTOM\n";
 					$event .= "Event-Name: CUSTOM\n";