summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 53c2ca3)
raw | patch | inline | side by side (parent: 53c2ca3)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 29 Nov 2006 05:57:49 +0000 (05:57 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Wed, 29 Nov 2006 05:57:49 +0000 (05:57 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5238 594d385d-05f5-0310-b6e9-bd551577e9d8
plugins/admin/systems/class_printGeneric.inc | patch | blob | history | |
plugins/admin/systems/class_termDNS.inc | patch | blob | history |
diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 9b7d83051f9d432315255059704a98b8acc8a596..1a37efb1a2daeed2a5dff030efe1f4de636e5342 100644 (file)
$ppdManager= new ppdManager($path);
if(!empty($this->gotoPrinterPPD)){
if((!file_exists($path.$this->gotoPrinterPPD))){
- $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD))."</b>";
+ $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD)."</b>");
}else{
$smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD));
}
index 64f63615de459212a9d7fc5640fba4a4cf9a70e7..f73fe741fe1c18baf372227799c0242752687330 100644 (file)
/* Check if ip must be given
*/
if(($this->IPisMust)||($this->DNS_is_account)){
-
- /* Check if ip is empty
- */
- if ($this->ipHostNumber == "" && $this->acl_is_writeable("ipHostNumber")){
+ if (empty($this->ipHostNumber)){
$message[]= _("The required field 'IP-address' is not set.");
}
- }
-
- /* check if given ip is valid ip */
- if ($this->ipHostNumber != "" && !is_ip($this->ipHostNumber)){
- $message[]= _("Wrong IP format in field IP-address.");
+ if (!is_ip($this->ipHostNumber)){
+ $message[]= _("Wrong IP format in field IP-address.");
+ }
}
/* Check if mac is empty
*/
- if ($this->macAddress == "" && $this->acl_is_writeable("macAddress")){
+ if ($this->macAddress == "" ){
$message[]= _("The required field 'MAC-address' is not set.");
}
-
- /* Check if given mac is valid mac
- */
- $tr = count(split(":",$this->macAddress));
if(!is_mac($this->macAddress)){
$message[]=(_("The given macaddress is invalid. There must be 6 2byte segments seperated by ':'."));
}
$checkArray = array();
$onlyOnce = array();
- // $onlyOnce['cNAMERecord'] = 0;
+ // $onlyOnce['cNAMERecord'] = 0;
/* Walk through all entries and detect duplicates or mismatches
*/