X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_ppdManager.inc;h=7e416556d036bcf13f8aa23af19f69c783d3b019;hb=d2a7f50083180fccb855c116a0f16cbca2636f62;hp=a5fad07309cc51686f14454dc121246d4b754ddb;hpb=6b00d18b23b0d877695f9a3a56b57437defbd7f6;p=gosa.git diff --git a/include/class_ppdManager.inc b/include/class_ppdManager.inc index a5fad0730..7e416556d 100644 --- a/include/class_ppdManager.inc +++ b/include/class_ppdManager.inc @@ -73,6 +73,12 @@ class ppdManager continue; } + /* Change model name .. */ + if ((preg_match("/^\*".$attribute.":*\s+/",$line)) && ($attribute == "ModelName")){ + $line= "*$attribute: \"$value\"\n"; + $done =true; + } + if (($fsection) && ($section != "NO_SECTION")){ if (preg_match("/^\*CloseGroup:*\s+\**$section\/*/", $line)){ $fsection= false; @@ -136,10 +142,9 @@ class ppdManager { if(!is_readable($ppdFile)){ print_red(sprintf(_("Specified ppd file '%s' can't be opened for reading."),$ppdFile)); - }elseif(is_writeable($ppdFile.".tmp")){ + }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)){