diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc
index c63a68a1d6b8af77398954e14feb1a6df1d70c6f..9296afe61985cfcd1585baae1e9ef623dcdb16c7 100644 (file)
/* Check if path is write/readable*/
$is_r = @is_readable($path);
- if((!is_dir($path))||(empty($path)) || (!$is_r)){
- print_red(sprintf(_("The specified path '%s' which results from PPD_PATH in your gosa.conf is invalid,".
- " can't read/write any ppd informations."),$path));
+ if(((!is_dir($path))||(empty($path)) || (!$is_r)) && (!@mkdir($path))){
+ print_red(sprintf(_("The specified path '%s' which results from PPD_PATH in your gosa.conf is invalid, can't read/write any ppd informations."),$path));
/* Print out template */
$display.= $smarty->fetch(get_template_path('printerPPDDialog.tpl', TRUE,dirname(__FILE__)));
return($display);
*/
function getPrinterReload()
{
- $tmp = $this->ppdManager->getPrinterList(true);
+ if(is_readable($this->pathToPPD)){
+ $tmp = $this->ppdManager->getPrinterList(true);
- $this->ppdListHeader = $this->ppdList = array();
+ $this->ppdListHeader = $this->ppdList = array();
- /* Sort all available files, and create header (Vendor index) */
- foreach($tmp as $file=>$ppd){
+ /* Sort all available files, and create header (Vendor index) */
+ foreach($tmp as $file=>$ppd){
- if(preg_match("#".$this->pathToModified."#",$file)) continue;
+ if(preg_match("#".$this->pathToModified."#",$file)) continue;
- $tmp2 = split("\n",$ppd);
- if(!isset($this->ppdListHeader[$tmp2[0]])){
- $this->ppdListHeader[$tmp2[0]]=0;
+ $tmp2 = split("\n",$ppd);
+ if(!isset($this->ppdListHeader[$tmp2[0]])){
+ $this->ppdListHeader[$tmp2[0]]=0;
+ }
+ $tmp3['name'] =preg_replace("/^ -/","",$tmp2[1]." - ".$tmp2[2]);
+ $tmp3['link'] =$file;
+ $tmp3['ppd'] =$ppd;
+ $this->ppdListHeader[$tmp2[0]]++;
+ $this->ppdList[$tmp2[0]][preg_replace("/^ -/","",$tmp2[1]." - ".$tmp2[2])]=$tmp3;
}
- $tmp3['name'] =preg_replace("/^ -/","",$tmp2[1]." - ".$tmp2[2]);
- $tmp3['link'] =$file;
- $tmp3['ppd'] =$ppd;
- $this->ppdListHeader[$tmp2[0]]++;
- $this->ppdList[$tmp2[0]][preg_replace("/^ -/","",$tmp2[1]." - ".$tmp2[2])]=$tmp3;
}
}
return($str);
}
- function check(){ return(plugin::check()); }
+ function check()
+ {
+ $message = plugin::check();
+ if(empty($this->selectedPPD['link'])){
+ $message[] = _("Please select a valid ppd file or use 'Cancel' to go back to printer configuration.");
+ }
+ return($message);
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>