PMF Plugin Loading

src/API/PluginAPI.php

@@ -50,42 +50,51 @@ class PluginAPI extends stdClass{
 	}
 
 	public function load($file){
-		$content = file_get_contents($file);
+		if(strtolower(substr($file, -3)) === "pmf"){
-		$info = strstr($content, "*/", true);
+			$pmf = new PMFPlugin($file);
-		$content = substr(strstr($content, "*/"),2);
+			$info = $pmf->getPluginInfo();
-		if(preg_match_all('#([a-zA-Z0-9\-_]*)=([^\r\n]*)#u', $info, $matches) == 0){ //false or 0 matches
+		}else{
-			console("[ERROR] [PluginAPI] Failed parsing of ".basename($file));
+			$content = file_get_contents($file);
-			return false;
+			$info = strstr($content, "*/", true);
-		}
+			$content = substr(strstr($content, "*/"),2);
-		$info = array();
+			if(preg_match_all('#([a-zA-Z0-9\-_]*)=([^\r\n]*)#u', $info, $matches) == 0){ //false or 0 matches
-		foreach($matches[1] as $k => $i){
+				console("[ERROR] [PluginAPI] Failed parsing of ".basename($file));
-			$v = $matches[2][$k];
+				return false;
-			switch(strtolower($v)){
-				case "on":
-				case "true":
-				case "yes":
-					$v = true;
-					break;
-				case "off":
-				case "false":
-				case "no":
-					$v = false;
-					break;
 			}
-			$info[$i] = $v;
+			$info = array();
+			foreach($matches[1] as $k => $i){
+				$v = $matches[2][$k];
+				switch(strtolower($v)){
+					case "on":
+					case "true":
+					case "yes":
+						$v = true;
+						break;
+					case "off":
+					case "false":
+					case "no":
+						$v = false;
+						break;
+				}
+				$info[$i] = $v;
+			}
+			$info["code"] = $content;
+			$info["class"] = trim(strtolower($info["class"]));
 		}
 		if(!isset($info["name"]) or !isset($info["version"]) or !isset($info["class"]) or !isset($info["author"])){
 			console("[ERROR] [PluginAPI] Failed parsing of ".basename($file));
+			return false;
 		}
 		console("[INFO] [PluginAPI] Loading plugin \"\x1b[32m".$info["name"]."\x1b[0m\" \x1b[35m".$info["version"]." #".intval($info["apiversion"])."\x1b[0m by \x1b[36m".$info["author"]."\x1b[0m");
 		if(class_exists($info["class"])){
 			console("[ERROR] [PluginAPI] Failed loading plugin: class exists");
+			return false;
 		}
-		if(eval($content) === false or !class_exists($info["class"])){
+		if(eval($info["code"]) === false or !class_exists($info["class"])){
 			console("[ERROR] [PluginAPI] Failed loading plugin: evaluation error");
+			return false;
 		}
-		$info["code"] = $content;
+		
-		$info["class"] = trim(strtolower($info["class"]));
 		$className = $info["class"];
 		if(isset($info["apiversion"]) and intval($info["apiversion"]) > CURRENT_API_VERSION){
 			console("[ERROR] [PluginAPI] Plugin \"".$info["name"]."\" uses a newer API! It can crash or corrupt the server!");
@@ -168,7 +177,8 @@ class PluginAPI extends stdClass{
 		$dir = dir(DATA_PATH."plugins/");
 		while(false !== ($file = $dir->read())){
 			if($file{0} !== "."){
-				if(strtolower(substr($file, -3)) === "php"){
+				$ext = strtolower(substr($file, -3));
+				if($ext === "php" or $ext === "pmf"){
 					$this->load(DATA_PATH."plugins/" . $file);
 				}
 			}

src/pmf/PMF.php

@@ -59,16 +59,16 @@ class PMF{
 			if($stat["size"] >= 5){ //Header + 2 Bytes
 				return true;
 			}
-			fclose($this->fp);
+			$this->close();
 		}
 		return false;
 	}
 	
 	public function parseInfo(){
+		$this->seek(0);
 		if(fread($this->fp, 3) !== "PMF"){
 			return false;			
 		}		
-		$this->seek(0);
 		$this->version = ord($this->read(1));
 		switch($this->version){
 			case 0x01:
@@ -87,7 +87,9 @@ class PMF{
 	
 	public function close(){
 		unset($this->version, $this->type, $this->file);
-		fclose($this->fp);
+		if(is_object($this->fp)){
+			fclose($this->fp);
+		}
 	}
 	
 	public function create($file, $type, $version = PMF_CURRENT_VERSION){
@@ -98,7 +100,7 @@ class PMF{
 			}
 		}
 		$this->seek(0);
-		$this->write("PMF" . chr((int) $type) . chr((int) $version));
+		$this->write("PMF" . chr((int) $version) . chr((int) $type));
 	}
 	
 	public function read($length){

src/pmf/Plugin.php

@@ -39,8 +39,12 @@ class PMFPlugin extends PMF{
 		$this->parsePlugin();
 	}
 	
+	public function getPluginInfo(){
+		return $this->pluginData;
+	}
+	
 	protected function parsePlugin(){
-		if($this->type !== 0x01){
+		if($this->getType() !== 0x01){
 			return false;
 		}
 		
@@ -48,12 +52,13 @@ class PMFPlugin extends PMF{
 		$this->pluginData["name"] = $this->read(Utils::readShort($this->read(2), false));
 		$this->pluginData["version"] = $this->read(Utils::readShort($this->read(2), false));
 		$this->pluginData["author"] = $this->read(Utils::readShort($this->read(2), false));
+		$this->pluginData["apiversion"] = Utils::readShort($this->read(2), false);
 		$this->pluginData["class"] = $this->read(Utils::readShort($this->read(2), false));
 		$this->pluginData["identifier"] = $this->read(Utils::readShort($this->read(2), false)); //Will be used to check for updates
-		$this->pluginData["extra"] = $this->read(Utils::readShort($this->read(2), false)); //Additional custom plugin data
+		$this->pluginData["extra"] = gzinflate($this->read(Utils::readShort($this->read(2), false))); //Additional custom plugin data
 		$this->pluginData["code"] = "";
 		while(!feof($this->fp)){
-			$this->pluginData["code"] .= fread($this->fp, 4096);
+			$this->pluginData["code"] .= $this->read(4096);
 		}
 		$this->pluginData["code"] = gzinflate($this->pluginData["code"]);
 	}