X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_ppdManager.inc;h=7e416556d036bcf13f8aa23af19f69c783d3b019;hb=c79e9f20056ebc7ee5872d2a072fc36bc5b097ca;hp=1852a3e5fbb45c8ab9230ff4c1340c2a55c1cc61;hpb=b74a6ff0ea867aee2f59f9c81937d6bd6b135c64;p=gosa.git

diff --git a/include/class_ppdManager.inc b/include/class_ppdManager.inc
index 1852a3e5f..7e416556d 100644
--- a/include/class_ppdManager.inc
+++ b/include/class_ppdManager.inc
@@ -7,7 +7,12 @@ class ppdManager
 
 	function ppdManager($path)
 	{
+		if(is_dir($path)){
 		$this->path= $path;
+		}else{
+			print_red(sprintf(_("PPD manager : The specified path '%s' doesn't exists."),$path));
+			return (false);
+		}
 	}
 
 
@@ -41,7 +46,7 @@ class ppdManager
 		return ($list);
 	}
 
-	
+
 	function updateAttribute($file, $section, $attribute, $value)
 	{
 		$fsection= false;
@@ -49,70 +54,113 @@ class ppdManager
 		$section= preg_replace('/^\*/', '', $section);
 		$attribute= preg_replace('/^\*/', '', $attribute);
 
-		$rp= fopen($file, "r");
-		$wp= fopen("$file.tmp", "w");
+		$rp= @fopen($file, "r");
+		$wp= @fopen("$file.tmp", "w");
+
+		
 
 		while (!feof($rp)){
-			$line= fgets($rp, 1024);
+			$lines[]= fgets($rp, 1024);
+		}
 
+		$ret = "";
+		$done =false;
+		foreach($lines as $nr => $line){
+	
 			if (preg_match("/\*OpenGroup:*\s+\**$section\/*/", $line)){
-				$fsection= true;
-				continue;
+                $fsection= true;
+				$ret .=$line; 
+                continue;
+            }
+
+			/* Change model name .. */
+			if ((preg_match("/^\*".$attribute.":*\s+/",$line)) && ($attribute == "ModelName")){
+				$line= "*$attribute: \"$value\"\n";
+				$done =true;
 			}
 
-			if ($fsection){
+			if (($fsection) && ($section != "NO_SECTION")){
 				if (preg_match("/^\*CloseGroup:*\s+\**$section\/*/", $line)){
 					$fsection= false;
-					fwrite ($wp, $line);
+					$ret .=$line; 
+					continue;
+				}
+
+
+				if (preg_match("/^\*OpenUI:*\s+\**$attribute\/*/", $line)){
+					$fattribute= true;
+					$ret .= $line; 
 					continue;
 				}
 
+				if ($fattribute){
+					if (preg_match("/^\*CloseUI:*\s+\**$attribute\/*/", $line)){
+						$fattribute= false;
+						$ret .= $line; 
+						continue;
+					}
+
+					if (preg_match("/^\*Default$attribute:*\s+/", $line)){
+						$line= "*Default$attribute: $value\n";
+						$done =true;
+					}
+				}
+			}else{
 				if (preg_match("/^\*OpenUI:*\s+\**$attribute\/*/", $line)){
 					$fattribute= true;
-					fwrite ($wp, $line);
+					$ret .= $line; 
 					continue;
 				}
 
 				if ($fattribute){
 					if (preg_match("/^\*CloseUI:*\s+\**$attribute\/*/", $line)){
 						$fattribute= false;
-						fwrite ($wp, $line);
+						$ret .= $line; 
 						continue;
 					}
 
 					if (preg_match("/^\*Default$attribute:*\s+/", $line)){
 						$line= "*Default$attribute: $value\n";
+						$done =true;
 					}
 				}
 			}
-			fwrite ($wp, $line);
+			$ret .=$line; 
 		}
 
+		fwrite($wp,$ret);
+		
 		fclose($wp);
 		fclose($rp);
 
-		echo "Move $file.tmp to $file<br>";
+		copy("$file.tmp", "$file");
+		unlink("$file.tmp");
 	}
 
 
 	function saveProperties($ppdFile, $properties)
 	{
-		foreach ($properties as $name => $section){
-			foreach ($section as $attribute => $value){
-				if (is_array($value)){
-					$this->updateAttribute($ppdFile, $name, $attribute, $value['_default']);
+		if(!is_readable($ppdFile)){
+			print_red(sprintf(_("Specified ppd file '%s' can't be opened for reading."),$ppdFile));
+		}elseif(!is_writeable(preg_replace("#(^.*/).*$#","\\1",$ppdFile.".tmp"))){
+			print_red(sprintf(_("The required tmp file file '%s' can't be opened for writing."),$ppdFile.".tmp"));
+		}else{
+			foreach ($properties as $name => $section){
+				foreach ($section as $attribute => $value){
+					if (is_array($value)){
+						$this->updateAttribute($ppdFile, $name, $attribute, $value['_default']);
+					}
 				}
 			}
 		}
 	}
-	
-	
+
 	function loadProperties($ppdFile)
 	{
 		$group= "";
 		$option= "";
 		$properties= array();
-		
+
 		$fh= fopen ($ppdFile, 'r');
 		while (!feof($fh)) {
 
@@ -134,7 +182,7 @@ class ppdManager
 					trigger_error(_('Group name not unique!'), E_USER_WARNING);
 					continue;
 				}
-				
+
 				// TODO: Symbol values are not supported yet!
 				if (preg_match('/\^/', $line)){
 					trigger_error(_('Symbol values are not supported yet!'), E_USER_WARNING);
@@ -164,7 +212,7 @@ class ppdManager
 					trigger_error(_('Nested options are not supported!'), E_USER_WARNING);
 					continue;
 				}
-				
+
 				// TODO: Symbol values are not supported yet!
 				if (preg_match('/\^/', $line)){
 					trigger_error(_('Symbol values are not supported yet!'), E_USER_WARNING);
@@ -183,13 +231,16 @@ class ppdManager
 				$type= trim(preg_replace('/^[^:]+:\s+/', '', $line));
 				$name= preg_replace('/:.*$/', '', $name);
 				$option= preg_replace('/:.*$/', '', $option);
-				
+
 				// TODO: PickMany is not supported yet!
 				if (preg_match('/PickMany/i', $type)){
 					trigger_error(_('PickMany is not supported yet!'), E_USER_WARNING);
 				}
-				
-				$properties[$group][$option]= array('_name' => $name, '_type' => $type);
+				if(empty($group)){
+					$properties["NO_SECTION"][$option]= array('_name' => $name, '_type' => $type);
+				}else{
+					$properties[$group][$option]= array('_name' => $name, '_type' => $type);
+				}
 				continue;
 			}
 			/* Show interest for option parsing */
@@ -206,40 +257,46 @@ class ppdManager
 				/* Default value? */
 				if (preg_match("@^\*Default$eoption:@", $line)){
 					$c= preg_replace("@^\*Default$eoption:\s+@", "", $line);
-					$properties[$group][$option]['_default']= trim(trim($c, '"'));
+					if(empty($group)){
+						$properties["NO_SECTION"][$option]['_default']= trim(trim($c, '"'));
+					}else{
+						$properties[$group][$option]['_default']= trim(trim($c, '"'));
+					}
 					continue;
 				}
 
 				/* Possible value? */
 				if (preg_match("@^\*$eoption\s+@", $line)){
-				#*PageSize Letter/US Letter: "<>setpagedevice"
+#*PageSize Letter/US Letter: "<>setpagedevice"
 					$c= preg_replace("@^\*$eoption\s+([^/]+).*$@", "$1", $line);
 					$d= preg_replace("@^\*$eoption\s+[^/]+/([^:]+).*$@", "$1", $line);
-					$properties[$group][$option][trim($c)]= trim($d);
+					if(empty($group)){
+						$properties["NO_SECTION"][$option][trim($c)]= trim($d);
+					}else{
+						$properties[$group][$option][trim($c)]= trim($d);
+					}
 					continue;
 				}
 			}
-
 		}
 		fclose ($fh);
-
 		return ($properties);
 	}
-	
+
 	function loadDescription($ppdFile)
 	{
 		$model= "";
 		$manufacturer= "";
-		
+
 		$fh= fopen ($ppdFile, 'r');
-		while (!feof($fh)) {
+		while ((!feof($fh))&&($fh)) {
 
 			/* Read line */
 			$line= fgets($fh, 256);
 			if (strlen($line) >= 256){
 				trigger_error(_('Parsing PPD file %s failed - line too long. Trailing characters have been ignored'), E_USER_WARNING);
 			}
-			
+
 			/* Extract interesting informations */
 			if (preg_match('/^\*Manufacturer:/i', $line)){
 				$manufacturer= preg_replace('/^\*Manufacturer:\s+"?([^"]+)"?.*$/i', '\1', $line);
@@ -281,7 +338,7 @@ class ppdManager
 
 		return ($this->cachedList);
 	}
-	
+
 }
 
 ?>