From 4c138afa1befaca9f4753f2864dd029dd7bb467a Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 15 Sep 2011 08:37:00 +0000 Subject: [PATCH] Backport from trunk -Replaced all in_array calls with self-made in_array_strict which simple calls in_array([],[], TRUE) from strict matching mode git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.7@20997 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../connectivity/class_intranetAccount.inc | 6 +-- .../services/dhcp/class_dhcpAdvanced.inc | 8 +-- .../services/dhcp/class_dhcpNetwork.inc | 2 +- .../systems/services/dhcp/class_dhcpPool.inc | 2 +- .../services/dhcp/class_dhcpSharedNetwork.inc | 2 +- .../systems/services/dhcp/class_servDHCP.inc | 14 +++--- .../admin/systems/services/dns/class_DNS.inc | 6 +-- .../systems/services/dns/class_servDNS.inc | 2 +- .../dns/class_servDNSeditZoneEntries.inc | 4 +- .../fai/classSelect/class_classSelect.inc | 2 +- .../fai/classSelect/class_filterFAIClass.inc | 4 +- gosa-plugins/fai/admin/fai/class_FAI.inc | 12 ++--- .../fai/admin/fai/class_askClassName.inc | 6 +-- .../fai/admin/fai/class_debconfTemplate.inc | 2 +- .../fai/admin/fai/class_faiDiskEntry.inc | 4 +- .../fai/admin/fai/class_faiGroupHandle.inc | 4 +- .../fai/admin/fai/class_faiHookEntry.inc | 2 +- .../fai/admin/fai/class_faiManagement.inc | 28 +++++------ .../fai/admin/fai/class_faiPackage.inc | 6 +-- .../fai/admin/fai/class_faiPartition.inc | 2 +- .../fai/admin/fai/class_faiPartitionTable.inc | 2 +- .../fai/class_faiPartitionTableEntry.inc | 8 +-- .../fai/admin/fai/class_faiProfile.inc | 2 +- .../fai/admin/fai/class_faiScript.inc | 2 +- .../fai/admin/fai/class_faiSummaryTab.inc | 10 ++-- .../fai/admin/fai/class_filterFAI.inc | 2 +- .../admin/fai/class_filterOPSIPackages.inc | 2 +- .../packageSelect/class_filterFAIPackages.inc | 2 +- .../blocklists/class_blocklistGeneric.inc | 14 +++--- .../gofax/faxaccount/class_gofaxAccount.inc | 26 +++++----- .../admin/ogroups/gofon/class_phonequeue.inc | 4 +- .../systems/gofon/class_phoneGeneric.inc | 4 +- .../services/gofon/class_goFonServer.inc | 2 +- .../macro/class_gofonMacroParameters.inc | 2 +- .../gofon/phoneaccount/class_phoneAccount.inc | 22 ++++---- .../class_ConfigManagementDataModel.inc | 2 +- .../class_newConfigManagement.inc | 6 +-- .../addons/goto/class_filterGotoEvents.inc | 16 +++--- .../goto/addons/goto/class_gotoLogView.inc | 2 +- .../addons/goto/class_goto_import_file.inc | 2 +- .../goto/addons/goto/class_gotomasses.inc | 4 +- .../addons/goto/events/class_DaemonEvent.inc | 2 +- .../goto/events/class_DaemonEvent_notify.inc | 4 +- .../events/class_EventAddSystemDialog.inc | 2 +- .../goto/events/class_EventAddUserDialog.inc | 4 +- .../class_ConfigManagement.inc | 2 +- .../class_TemplateWidget_fixedList.inc | 2 +- .../groups/apps/class_groupApplication.inc | 22 ++++---- .../admin/mimetypes/class_mimetypeGeneric.inc | 10 ++-- .../admin/ogroups/goto/class_termgroup.inc | 10 ++-- .../goto/Device/class_InstallRecipe.inc | 4 +- .../systems/goto/class_gotoLpdEnabled.inc | 2 +- .../admin/systems/goto/class_printGeneric.inc | 6 +-- .../systems/goto/class_terminalGeneric.inc | 6 +-- .../systems/goto/class_terminalService.inc | 12 ++--- .../systems/goto/class_terminalStartup.inc | 8 +-- .../systems/goto/class_workstationGeneric.inc | 8 +-- .../systems/goto/class_workstationStartup.inc | 10 ++-- .../goto/admin/systems/goto/tabs_printers.inc | 2 +- .../goto/admin/systems/goto/tabs_terminal.inc | 2 +- .../admin/systems/goto/tabs_workstation.inc | 2 +- .../admin/systems/ppd/class_ppdManager.inc | 2 +- .../services/kiosk/class_goKioskService.inc | 2 +- .../systems/services/shares/class_servNfs.inc | 2 +- .../terminal/class_goTerminalServer.inc | 2 +- .../environment/class_environment.inc | 34 ++++++------- .../class_GroupwareDistributionList.inc | 6 +-- .../personal/groupware/class_FilterEditor.inc | 4 +- .../personal/groupware/class_Groupware.inc | 4 +- .../services/kerberos/class_goKrbServer.inc | 4 +- .../connectivity/kolab/class_kolabAccount.inc | 14 +++--- .../mail/kolab/class_mail-methods-kolab.inc | 2 +- .../mail/addons/mailqueue/class_mailqueue.inc | 2 +- .../addons/mailqueue/class_si_mailqueue.inc | 2 +- .../admin/groups/mail/class_groupMail.inc | 30 +++++------ .../mail/class_mail-methods-cyrus.inc | 2 +- .../mail/personal/mail/class_mail-methods.inc | 6 +-- .../mail/personal/mail/class_mailAccount.inc | 32 ++++++------ .../personal/mail/sieve/class_My_Tree.inc | 24 ++++----- .../mail/personal/mail/sieve/class_parser.inc | 4 +- .../personal/mail/sieve/class_scanner.inc | 2 +- .../mail/sieve/class_sieveElement_If.inc | 18 +++---- .../mail/sieve/class_sieveElement_Require.inc | 2 +- .../sieve/class_sieveElement_Vacation.inc | 4 +- .../mail/sieve/class_sieveManagement.inc | 12 ++--- .../services/kerberos/class_goKrbServer.inc | 4 +- .../services/kerberos/class_krb5_policy.inc | 2 +- .../kerberos/class_password-methods-MIT.inc | 2 +- .../personal/nagios/class_nagiosAccount.inc | 2 +- .../opengroupware/class_opengw.inc | 8 +-- .../opengroupware/class_opengwAccount.inc | 4 +- .../opsiLicenses/class_licenseGeneric.inc | 4 +- .../opsiLicenses/class_licensePoolGeneric.inc | 4 +- .../opsiLicenses/class_licenseUsageByHost.inc | 4 +- .../connectivity/phpgw/class_phpgwAccount.inc | 6 +-- .../pureftpd/class_pureftpdAccount.inc | 6 +-- .../rsyslog/addons/rsyslog/class_rsyslog.inc | 6 +-- .../services/rsyslog/class_rSyslogServer.inc | 2 +- .../personal/samba/class_sambaAccount.inc | 50 +++++++++---------- .../personal/samba/class_sambaMungedDial.inc | 8 +-- .../personal/scalix/class_scalixAccount.inc | 4 +- .../connectivity/squid/class_proxyAccount.inc | 14 +++--- .../sudo/admin/sudo/class_sudoGeneric.inc | 6 +-- .../sudo/admin/sudo/class_sudoOption.inc | 26 +++++----- .../admin/systems/class_filterSYSTEMS.inc | 20 ++++---- .../admin/systems/class_systemManagement.inc | 14 +++--- .../systems/admin/systems/class_termDNS.inc | 6 +-- .../systems/admin/systems/tabs_server.inc | 2 +- .../webdav/class_webdavAccount.inc | 6 +-- 109 files changed, 400 insertions(+), 400 deletions(-) diff --git a/gosa-plugins/connectivity/personal/connectivity/class_intranetAccount.inc b/gosa-plugins/connectivity/personal/connectivity/class_intranetAccount.inc index bc9d02674..b30938db9 100644 --- a/gosa-plugins/connectivity/personal/connectivity/class_intranetAccount.inc +++ b/gosa-plugins/connectivity/personal/connectivity/class_intranetAccount.inc @@ -94,7 +94,7 @@ class intranetAccount extends plugin $smarty->assign('gosaIntranetACL', $this->getacl("",$this->ReadOnly)); } - $smarty->assign("use_intranet",in_array("intranet",$this->multi_boxes)); + $smarty->assign("use_intranet",in_array_strict("intranet",$this->multi_boxes)); $smarty->assign("multiple_support",$this->multiple_support_active); $display.= $smarty->fetch (get_template_path('intranet.tpl', TRUE, dirname(__FILE__))); return ($display); @@ -246,7 +246,7 @@ class intranetAccount extends plugin function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("intranet",$this->multi_boxes)){ + if(in_array_strict("intranet",$this->multi_boxes)){ $ret['is_account'] = $this->is_account; } return($ret); @@ -263,7 +263,7 @@ class intranetAccount extends plugin function init_multiple_support($attrs,$all) { plugin::init_multiple_support($attrs,$all); - if(isset($attrs['objectClass']) && in_array("gosaIntranetAccount",$attrs['objectClass'])){ + if(isset($attrs['objectClass']) && in_array_strict("gosaIntranetAccount",$attrs['objectClass'])){ $this->is_account = TRUE; } } diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc index 47799858a..bcad3a306 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc @@ -61,7 +61,7 @@ class dhcpAdvanced extends plugin if ($acl_writeable && isset($_POST['delete_statement']) && isset($_POST['dhcpstatements'])){ $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpstatements')); $key = preg_replace('/^.*_/', '', get_post('dhcpstatements')); - if (in_array($name, $this->autoStatements)){ + if (in_array_strict($name, $this->autoStatements)){ msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG); } else { $this->statements->remove($name,$key); @@ -75,7 +75,7 @@ class dhcpAdvanced extends plugin if ($acl_writeable && isset($_POST['delete_option']) && isset($_POST['dhcpoptions'])){ $name = preg_replace('/_[0-9]*$/', '', get_post('dhcpoptions')); $key = preg_replace('/^.*_/', '', get_post('dhcpoptions')); - if (in_array($name, $this->autoOptions)){ + if (in_array_strict($name, $this->autoOptions)){ msg_dialog::display(_("Error"), _("Cannot delete automatic statements!"), ERROR_DIALOG); } else { $this->options->remove($name,$key); @@ -90,7 +90,7 @@ class dhcpAdvanced extends plugin /* Assign statements */ $statements= array(); foreach ($this->statements->getAll() as $key => $val){ - if (in_array($key, $this->autoStatements)){ + if (in_array_strict($key, $this->autoStatements)){ foreach($val as $id => $entry){ $statements[$key."_".$id]= "$key $entry ["._("automatic")."]"; } @@ -105,7 +105,7 @@ class dhcpAdvanced extends plugin /* Assign options */ $options= array(); foreach ($this->options->getAll() as $key => $val){ - if (in_array($key, $this->autoOptions)){ + if (in_array_strict($key, $this->autoOptions)){ foreach($val as $id => $entry){ $options[$key."_".$id]= "$key $entry ["._("automatic")."]"; } diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc index f02c99332..259ae3927 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc @@ -168,7 +168,7 @@ class dhcpNetwork extends plugin } else { /* Only quote filename values */ - if(in_array($key,array("filename"))){ + if(in_array_strict($key,array("filename"))){ $this->statements->set($key,'"'.trim(get_post($val),"\"").'"'); }else{ $this->statements->set($key,get_post($val)); diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc index ecb2ecacb..23a5553e1 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc @@ -171,7 +171,7 @@ class dhcpPool extends dhcpPlugin "dhcpGroup", "dhcpPool", "dhcpSubnet", "dhcpSharedNetwork"); foreach ($cache[$dn]['objectClass'] as $oc){ - if (in_array($oc, $types)){ + if (in_array_strict($oc, $types)){ $type= $oc; break; } diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc index 49c5a5695..679acf16d 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc @@ -59,7 +59,7 @@ class dhcpSharedNetwork extends dhcpPlugin "unknown-clients" => "allow_unknown_state", "bootp" => "allow_bootp_state", "booting" => "allow_booting_state") as $state => $target){ - if(in_array($state,$allow)){ + if(in_array_strict($state,$allow)){ $smarty->assign($target,"checked"); }else{ $smarty->assign($target,""); diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc index 65f61d757..8acb472eb 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc @@ -351,7 +351,7 @@ class servdhcp extends goService foreach($this->dhcpSections as $section => $values ){ // Ensure that we've a valid id for this section. - if(!in_array($section,$this->dhcpDNtoID)){ + if(!in_array_strict($section,$this->dhcpDNtoID)){ $this->dhcpDNtoID[] = $section; } @@ -481,7 +481,7 @@ class servdhcp extends goService if($this->dn != $this->orig_dn){ $fixed = FALSE; foreach(array("dhcpHost","dhcpSubnet","dhcpGroup","dhcpSharedNetwork") as $object){ - if(in_array($object,$data['objectClass']) && isset($data['dhcpOption'])){ + if(in_array_strict($object,$data['objectClass']) && isset($data['dhcpOption'])){ foreach($data['dhcpOption'] as $key => $option){ if(preg_match("/^server-name /",$option)){ $data['dhcpOption'][$key] = "server-name ".$this->cn; @@ -514,7 +514,7 @@ class servdhcp extends goService continue; } - if(in_array($attribute,array("dhcpPrimaryDN","dhcpSecondaryDN","dhcpServerDN","dhcpFailOverPeerDN"))){ + if(in_array_strict($attribute,array("dhcpPrimaryDN","dhcpSecondaryDN","dhcpServerDN","dhcpFailOverPeerDN"))){ foreach($values as $v_key => $value){ $values[$v_key] = preg_replace("/".preg_quote($this->orig_dn, '/')."$/i",$this->dn,$value); } @@ -526,7 +526,7 @@ class servdhcp extends goService foreach($values as $key => $value){ $option_name = trim(preg_replace("/[^ ]*$/","",$value)); $option_value= trim(preg_replace("/^[^ ]*/","",$value)); - if(in_array($option_name,$this->quote_option)){ + if(in_array_strict($option_name,$this->quote_option)){ $values[$key] = $option_name." \"".$option_value."\""; } } @@ -645,7 +645,7 @@ class servdhcp extends goService foreach($values as $key => $value){ $value_name = trim(preg_replace("/[^ ]*$/","",$value)); $value_value= trim(preg_replace("/^[^ ]*/","",$value)); - if(in_array($value_name,$this->quote_option)){ + if(in_array_strict($value_name,$this->quote_option)){ $value_value = preg_replace("/^\"/","",$value_value); $value_value = preg_replace("/\"$/","",$value_value); $sattrs[$name][$key] = $value_name." ".$value_value; @@ -663,7 +663,7 @@ class servdhcp extends goService } foreach ($this->types as $key => $val){ - if (in_array("$key", $attrs['objectClass'])){ + if (in_array_strict("$key", $attrs['objectClass'])){ $type= $val; break; } @@ -698,7 +698,7 @@ class servdhcp extends goService "dhcpTSigKey", "dhcpDnsZone"); foreach ($this->dhcpObjectCache[$dn]['objectClass'] as $oc){ - if (in_array($oc, $types)){ + if (in_array_strict($oc, $types)){ $type= $oc; break; } diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc index b53e986d1..5128c82ed 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_DNS.inc @@ -138,7 +138,7 @@ class DNS /* Skip some attributes */ - if(in_array($name,$SkipRecords)) continue; + if(in_array_strict($name,$SkipRecords)) continue; /* If there is a record attribute */ @@ -560,7 +560,7 @@ class DNS * Or overwritten and filled with new values. */ foreach($newRecords as $name => $def){ - if(!in_array($name,$specialAttributes)){ + if(!in_array_strict($name,$specialAttributes)){ $add[$stdDn][$name] = $def; } } @@ -568,7 +568,7 @@ class DNS /* Delete all OLD special attributes. */ foreach($oldEntry['RECORDS'] as $id => $rec){ - if(in_array($rec['type'],$specialAttributes)){ + if(in_array_strict($rec['type'],$specialAttributes)){ $deldn= "relativeDomainName=".$rec['value'].",".$baseDn; $del[$deldn] = ""; } diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc index 17fd6741e..6ffdc38ba 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc @@ -75,7 +75,7 @@ class servdns extends goService continue; } $dn = preg_replace("/^zoneName=[^,]+,/","",$attrs['dn']); - if(preg_match("/^cn=/",$dn) && !in_array($dn,$dns)){ + if(preg_match("/^cn=/",$dn) && !in_array_strict($dn,$dns)){ $dns[] = $dn; } } diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc index 5721d9505..255cf1ea1 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc @@ -129,7 +129,7 @@ class servDNSeditZoneEntries extends plugin /* Check if there is at least one visible record. Else remove complete entry */ $visible = false; foreach($this->Devices[$Name]['RECORDS'] as $rec){ - if(in_array($rec['type'],$this->RecordTypes)){ + if(in_array_strict($rec['type'],$this->RecordTypes)){ $visible = true; break; } @@ -301,7 +301,7 @@ class servDNSeditZoneEntries extends plugin /* Check for multiple use of unique record types */ - if(in_array($Rec['type'],$singleEntries)){ + if(in_array_strict($Rec['type'],$singleEntries)){ if(!isset($tmp[$Rec['type']])){ $tmp[$Rec['type']] = ""; }else{ diff --git a/gosa-plugins/fai/admin/fai/classSelect/class_classSelect.inc b/gosa-plugins/fai/admin/fai/classSelect/class_classSelect.inc index 518193c76..dbfe22756 100644 --- a/gosa-plugins/fai/admin/fai/classSelect/class_classSelect.inc +++ b/gosa-plugins/fai/admin/fai/classSelect/class_classSelect.inc @@ -61,7 +61,7 @@ class classSelect extends management $str = ""; foreach($objTypes as $class => $img){ - if(in_array($class, $classes)){ + if(in_array_strict($class, $classes)){ $str .= $img; }else{ $str .= image('images/empty.png'); diff --git a/gosa-plugins/fai/admin/fai/classSelect/class_filterFAIClass.inc b/gosa-plugins/fai/admin/fai/classSelect/class_filterFAIClass.inc index 2659b3f6f..10fdfa466 100644 --- a/gosa-plugins/fai/admin/fai/classSelect/class_filterFAIClass.inc +++ b/gosa-plugins/fai/admin/fai/classSelect/class_filterFAIClass.inc @@ -42,7 +42,7 @@ class filterFAIClass { if(isset($attrs['cn'][0]) && preg_match("/".$regex."/i", $attrs['cn'][0])){ foreach($categories as $cat => $acl){ - if(in_array($cat,$attrs['objectClass'])){ + if(in_array_strict($cat,$attrs['objectClass'])){ $acl = $ui->get_permissions($attrs['dn'],"fai/".$acl); if(!isset($FAIAllclasses[$attrs['cn'][0]])){ $FAIAllclasses[$attrs['cn'][0]] = $attrs ; @@ -67,7 +67,7 @@ class filterFAIClass { if(isset($entry[$attr_name])){ $test = $entry[$attr_name]; if(!is_array($test)) $test = array($test); - if(in_array($match, $test)) unset($entries[$id]); + if(in_array_strict($match, $test)) unset($entries[$id]); } } } diff --git a/gosa-plugins/fai/admin/fai/class_FAI.inc b/gosa-plugins/fai/admin/fai/class_FAI.inc index e5d40a980..ec22c35a6 100644 --- a/gosa-plugins/fai/admin/fai/class_FAI.inc +++ b/gosa-plugins/fai/admin/fai/class_FAI.inc @@ -860,7 +860,7 @@ class FAI } /* Get sub release departments of this department */ - if(in_array("FAIbranch",$attr['objectClass'])) { + if(in_array_strict("FAIbranch",$attr['objectClass'])) { if($flat){ $tmp = FAI:: get_sub_releases_of_this_release($attr['dn'],$flat); foreach($tmp as $dn => $value){ @@ -892,7 +892,7 @@ class FAI $ou = $attrs['ou'][0]; } - if((in_array("FAIbranch",$attrs['objectClass'])) || ($ou == "fai")){ + if((in_array_strict("FAIbranch",$attrs['objectClass'])) || ($ou == "fai")){ return($attrs['dn']); } } @@ -1115,7 +1115,7 @@ class FAI /* The current object we want to create is an department. * Create the department and add the FAIbranch tag. */ - if(in_array("organizationalUnit",$attr['objectClass'])){ + if(in_array_strict("organizationalUnit",$attr['objectClass'])){ $attr['dn'] = LDAP::convert($destinationdn); $ldap->cd($basedn); $ldap->create_missing_trees($destinationdn); @@ -1154,7 +1154,7 @@ class FAI */ foreach($attr as $key => $value){ - if(in_array($key ,array("gotoLogonScript", "gosaApplicationIcon","gotoMimeIcon"))){ + if(in_array_strict($key ,array("gotoLogonScript", "gosaApplicationIcon","gotoMimeIcon"))){ $sr= ldap_read($ldap->cid, LDAP::fix($sourcedn), "$key=*", array($key)); $ei= ldap_first_entry($ldap->cid, $sr); if ($tmp= @ldap_get_values_len($ldap->cid, $ei,$key)){ @@ -1171,7 +1171,7 @@ class FAI } unset($attr['count']); unset($attr['dn']); - if(!in_array("FAIobject",$attr['objectClass'])){ + if(!in_array_strict("FAIobject",$attr['objectClass'])){ $attr['objectClass'][] = "FAIobject"; } $attr['FAIstate'] = $type; @@ -1215,7 +1215,7 @@ class FAI if($dn != $destinationdn){ $ldap->cd($basedn); $item = $ldap->fetch($ldap->cat($dn)); - if(!in_array("FAIbranch",$item['objectClass'])){ + if(!in_array_strict("FAIbranch",$item['objectClass'])){ FAI::copy_FAI_resource_recursive($dn,str_replace($sourcedn,$destinationdn,$dn),$destinationName,$type,false,$depth); } } diff --git a/gosa-plugins/fai/admin/fai/class_askClassName.inc b/gosa-plugins/fai/admin/fai/class_askClassName.inc index 2203198ea..31db9026e 100644 --- a/gosa-plugins/fai/admin/fai/class_askClassName.inc +++ b/gosa-plugins/fai/admin/fai/class_askClassName.inc @@ -57,7 +57,7 @@ class askClassName extends plugin foreach($res as $object){ /* skip class names with this name */ - if(in_array($this->objectClass,$object['objectClass']) || in_array("FAIprofile",$object['objectClass'])){ + if(in_array_strict($this->objectClass,$object['objectClass']) || in_array_strict("FAIprofile",$object['objectClass'])){ if(isset($object['FAIstate'][0]) && preg_match("/removed$/",$object['FAIstate'][0])){ continue; } @@ -65,7 +65,7 @@ class askClassName extends plugin } /* Skip profiles */ - if(!in_array("FAIprofile",$object['objectClass'])){ + if(!in_array_strict("FAIprofile",$object['objectClass'])){ if(isset($object['cn'])){ $used[$object['cn'][0]]= $object['cn'][0]; } @@ -150,7 +150,7 @@ class askClassName extends plugin $message[]= msgPool::required(_("Name")); } - if(in_array($this->ClassName,$this->forbidden)){ + if(in_array_strict($this->ClassName,$this->forbidden)){ $message[]= msgPool::duplicated(_("Name")); } diff --git a/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc b/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc index f5bb9ad75..2f66dd422 100644 --- a/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc +++ b/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc @@ -262,7 +262,7 @@ class debconf $defs = explode(", ",$data['Default']); foreach($choices as $value){ - if(in_array($value,$defs)){ + if(in_array_strict($value,$defs)){ $result.="\n".$value."
"; }else{ $result.="\n".$value."
"; diff --git a/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc b/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc index 7742ad6a8..0c63bf536 100644 --- a/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc +++ b/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc @@ -366,7 +366,7 @@ class faiDiskEntry extends plugin // Check which of the available disks are unused. $ret = array(); foreach($may as $val){ - if(!in_array($val,$used)){ + if(!in_array_strict($val,$used)){ $ret[$val] = $val; } } @@ -429,7 +429,7 @@ class faiDiskEntry extends plugin $used[$key] = $part['FAIpartitionNr']; } $id = 1; - while(in_array($id,$used) && $id < 16 ){ + while(in_array_strict($id,$used) && $id < 16 ){ $id++; } return($id); diff --git a/gosa-plugins/fai/admin/fai/class_faiGroupHandle.inc b/gosa-plugins/fai/admin/fai/class_faiGroupHandle.inc index c9dd0a34f..095be0523 100644 --- a/gosa-plugins/fai/admin/fai/class_faiGroupHandle.inc +++ b/gosa-plugins/fai/admin/fai/class_faiGroupHandle.inc @@ -10,7 +10,7 @@ class faiGroupHandle{ public function __construct($FAI_group, $Action) { - if(in_array($Action,array("edit","remove","copy","cut"))){ + if(in_array_strict($Action,array("edit","remove","copy","cut"))){ $this->mode = $Action; }else{ trigger_error("Wrong action type '".$Action."'."); @@ -42,7 +42,7 @@ class faiGroupHandle{ function save_object() { if(isset($_POST['faiGroupHandle'])){ - if(in_array($this->mode,array("copy","cut","remove"))){ + if(in_array_strict($this->mode,array("copy","cut","remove"))){ foreach($this->FAI_group as $key => $group){ if(isset($_POST[$this->mode."_".$key])){ $this->FAI_group[$key]['selected'] = TRUE; diff --git a/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc b/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc index 84bac6b14..a72c866da 100644 --- a/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc +++ b/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc @@ -111,7 +111,7 @@ class faiHookEntry extends plugin $used_tasks = $this->parent->getUsedFAItask($this->cn); $tasks = $this->tasks; foreach($this->tasks as $id => $task){ - if(in_array($task,$used_tasks)){ + if(in_array_strict($task,$used_tasks)){ unset($tasks[$id]); } } diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc index c420d2224..5dfe887d0 100644 --- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc +++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc @@ -159,7 +159,7 @@ class faiManagement extends management $entry = $headpage->getEntry($t); // Check for valid FAI objects - if(in_array('FAKE_OC_FAI', $entry['objectClass'])){ + if(in_array_strict('FAKE_OC_FAI', $entry['objectClass'])){ foreach($entry['GROUPS'] as $g){ $type = $this->get_type($g); $this->cpHandler->add_to_queue($g['dn'],"copy",$type[0],$type[2],'fai',$this); @@ -284,7 +284,7 @@ class faiManagement extends management if($entry){ // Edit Opsi objects here - if(in_array("opsi_local", $entry['TYPES']) || in_array("opsi_netboot", $entry['TYPES'])){ + if(in_array_strict("opsi_local", $entry['TYPES']) || in_array_strict("opsi_netboot", $entry['TYPES'])){ $name = $entry['cn']; $cfg = $this->opsi->get_product_properties($name); @@ -351,7 +351,7 @@ class faiManagement extends management $to_delete = array(); foreach($target as $id){ $object = $headpage->getEntry($id); - if(in_array("FAKE_OC_FAI", $object['objectClass'])){ + if(in_array_strict("FAKE_OC_FAI", $object['objectClass'])){ foreach($object['GROUPS'] as $entry){ array_push($to_delete, $entry); } @@ -364,7 +364,7 @@ class faiManagement extends management $headpage = $this->getHeadpage(); if(count($target) == 1){ $entry = $headpage->getEntry($target[0]); - if($entry && in_array("FAKE_OC_FAI",$entry['objectClass'])){ + if($entry && in_array_strict("FAKE_OC_FAI",$entry['objectClass'])){ $this->dialogObject = new faiGroupHandle($entry['GROUPS'],"remove"); } } @@ -1039,25 +1039,25 @@ class faiManagement extends management function get_type($array) { if(!isset($array['objectClass'])) return(array()); - if(in_array("FAIpartitionTable",$array['objectClass'])){ + if(in_array_strict("FAIpartitionTable",$array['objectClass'])){ return(array("tabsPartition","faiPartitionTable","FAIPARTITIONTABS")); } - if(in_array("FAIscript",$array['objectClass'])){ + if(in_array_strict("FAIscript",$array['objectClass'])){ return(array("tabsScript","faiScript","FAISCRIPTTABS")); } - if(in_array("FAItemplate",$array['objectClass'])){ + if(in_array_strict("FAItemplate",$array['objectClass'])){ return(array("tabsTemplate","faiTemplate","FAITEMPLATETABS")); } - if(in_array("FAIhook",$array['objectClass'])){ + if(in_array_strict("FAIhook",$array['objectClass'])){ return(array("tabsHook","faiHook","FAIHOOKTABS")); } - if(in_array("FAIvariable",$array['objectClass'])){ + if(in_array_strict("FAIvariable",$array['objectClass'])){ return(array("tabsVariable","faiVariable","FAIVARIABLETABS")); } - if(in_array("FAIprofile",$array['objectClass'])){ + if(in_array_strict("FAIprofile",$array['objectClass'])){ return(array("tabsProfile","faiProfile","FAIPROFILETABS")); } - if(in_array("FAIpackageList",$array['objectClass'])){ + if(in_array_strict("FAIpackageList",$array['objectClass'])){ return(array("tabsPackage","faiPackage","FAIPACKAGETABS")); } return(array()); @@ -1096,7 +1096,7 @@ class faiManagement extends management $f = $this->fai_release; if($name == ""){ return(false); - }elseif(in_array($name,$this->getBranches($f))) { + }elseif(in_array_strict($name,$this->getBranches($f))) { return(false); }elseif(tests::is_department_name_reserved($name,$base)){ return(false); @@ -1132,7 +1132,7 @@ class faiManagement extends management $icon_list = ""; foreach($objects as $type => $type_data){ - if(in_array($type, $classes)){ + if(in_array_strict($type, $classes)){ $icon_list .= image($type_data['IMG'],'edit_'.$row.'_'.$type,$type_data['NAME']); }else{ $icon_list .= image('images/empty.png'); @@ -1203,7 +1203,7 @@ class faiManagement extends management $headpage = $this->getHeadpage(); $entry = $headpage->entries[$id]; - if(in_array('FAKE_OC_FAI', $entry['objectClass'])){ + if(in_array_strict('FAKE_OC_FAI', $entry['objectClass'])){ unset($_POST[$name]); if(isset($headpage->entries[$id]['GROUPS'][$tab])){ $data =$headpage->entries[$id]['GROUPS'][$tab]; diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc index 01b10daba..703f197cb 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc @@ -109,7 +109,7 @@ class faiPackage extends plugin $tmp['Type'] = $attr['FAIvariableType'][0]; if (isset($attr['FAIvariableContent'][0])){ - if(!in_array($attr['FAIvariableType'],array("multiselect"))){ + if(!in_array_strict($attr['FAIvariableType'],array("multiselect"))){ $tmp['Value'] = $attr['FAIvariableContent'][0]; }else{ $content = array(); @@ -646,7 +646,7 @@ class faiPackage extends plugin /* Tag object */ $this->tag_attrs($pkgattrs, $pkgdn, $this->gosaUnitTag); - if(in_array($pkgattrs['FAIvariableType'],array("boolean","multiselect","password","select","string","text"))){ + if(in_array_strict($pkgattrs['FAIvariableType'],array("boolean","multiselect","password","select","string","text"))){ if($pkgattrs['FAIvariableType'] == "text" && $pkgattrs['FAIvariableContent'] == ""){ gosa_log("Skipped saving FAIvariable '$name' empty string can't be saved."); @@ -755,7 +755,7 @@ class faiPackage extends plugin $tmp['Type'] = $attr['FAIvariableType'][0]; if (isset($attr['FAIvariableContent'][0])){ - if(!in_array($attr['FAIvariableType'],array("multiselect"))){ + if(!in_array_strict($attr['FAIvariableType'],array("multiselect"))){ $tmp['Value'] = $attr['FAIvariableContent'][0]; }else{ $content = array(); diff --git a/gosa-plugins/fai/admin/fai/class_faiPartition.inc b/gosa-plugins/fai/admin/fai/class_faiPartition.inc index 006bc35ee..094275ef9 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartition.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartition.inc @@ -275,7 +275,7 @@ class faiPartition extends plugin // Check which of the available disks are unused. $ret = array(); foreach($may as $val){ - if(!in_array($val,$used)){ + if(!in_array_strict($val,$used)){ $ret[$val] = $val; } } diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc index 3619ef8f6..57c630564 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc @@ -275,7 +275,7 @@ class faiPartitionTable extends plugin if(isset($this->disks[$s_entry]['FAIdiskType'])){ $type = $this->disks[$s_entry]['FAIdiskType']; } - if(in_array($type,array('raid','lvm','disk'))){ + if(in_array_strict($type,array('raid','lvm','disk'))){ $this->dialog = new faiDiskEntry( $this->config,$this->dn,$this,$this->disks[$s_entry], $this->disks[$s_entry]['FAIdiskType']); diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc index 9784bc74c..797afc1d0 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc @@ -295,7 +295,7 @@ class faiPartitionTableEntry extends plugin foreach($this->partitions as $key => $part){ foreach($this->UsedAttrs as $attrs){ - if(in_array($attrs,array('cn','description'))) continue; + if(in_array_strict($attrs,array('cn','description'))) continue; if($this->acl_is_writeable($attrs)){ @@ -333,7 +333,7 @@ class faiPartitionTableEntry extends plugin $message[] = msgPool::invalid(_("Name"),$d,"/[a-z0-9_\-]/i"); } - if($this->old_cn != $this->DISKcn && in_array($this->DISKcn,$this->parent->getUsedDiskNames())){ + if($this->old_cn != $this->DISKcn && in_array_strict($this->DISKcn,$this->parent->getUsedDiskNames())){ $message[] = msgPool::duplicated(_("Name")); } @@ -356,7 +356,7 @@ class faiPartitionTableEntry extends plugin continue; } - if((in_array($part['FAImountPoint'],$alreadyUsed['FAImountPoint']))&&($part['FAIfsType']!="swap")){ + if((in_array_strict($part['FAImountPoint'],$alreadyUsed['FAImountPoint']))&&($part['FAIfsType']!="swap")){ $message[]=sprintf(_("please enter a unique mount point for partition %s"),($key)); } @@ -366,7 +366,7 @@ class faiPartitionTableEntry extends plugin } } if($part['FAIfsType'] == "swap"){ - if(in_array($part['FAIfsType'],$alreadyUsed['FAIfsType'])){ + if(in_array_strict($part['FAIfsType'],$alreadyUsed['FAIfsType'])){ $message[]=sprintf(_("File system type 'swap' is already used, change file system type for partition %s."),$key); } } diff --git a/gosa-plugins/fai/admin/fai/class_faiProfile.inc b/gosa-plugins/fai/admin/fai/class_faiProfile.inc index 52b98a2ec..2f7d34773 100644 --- a/gosa-plugins/fai/admin/fai/class_faiProfile.inc +++ b/gosa-plugins/fai/admin/fai/class_faiProfile.inc @@ -68,7 +68,7 @@ class faiProfile extends plugin /* Sort by categorie */ foreach($categories as $cat){ - if(in_array($cat,$attrs['objectClass'])){ + if(in_array_strict($cat,$attrs['objectClass'])){ /* Append entry */ $this->FAIAllclasses[$attrs['cn'][0]][$cat]=$attrs; diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc index da995c33e..7551ad118 100644 --- a/gosa-plugins/fai/admin/fai/class_faiScript.inc +++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc @@ -330,7 +330,7 @@ class faiScript extends plugin } /* Get sort order */ - if(isset($_GET['sort']) && in_array($_GET['sort'],array("name","priority"))){ + if(isset($_GET['sort']) && in_array_strict($_GET['sort'],array("name","priority"))){ if($this->sort_by == $_GET['sort']){ if($this->sort_order == "up"){ $this->sort_order = "down"; diff --git a/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc b/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc index c39eaf296..2dae9bc1f 100644 --- a/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc +++ b/gosa-plugins/fai/admin/fai/class_faiSummaryTab.inc @@ -246,7 +246,7 @@ class faiSummaryTab extends plugin{ "".$this->objs[$key]['Name'].""; /* Display FAItemplate FAIhook FAIscript entries */ - if(in_array($key,array("FAItemplate","FAIhook","FAIscript"))){ + if(in_array_strict($key,array("FAItemplate","FAIhook","FAIscript"))){ $nums = array(); $tmp = array(); @@ -305,7 +305,7 @@ class faiSummaryTab extends plugin{ } /* Create variable entries */ - if(in_array($key,array("FAIvariable"))) { + if(in_array_strict($key,array("FAIvariable"))) { foreach($entry['Entries'] as $cn => $data){ $str .=""; $str .= $image." ".$data['cn'][0]; @@ -322,7 +322,7 @@ class faiSummaryTab extends plugin{ } /* Create packagelist entries */ - if(in_array($key,array("FAIpackageList"))) { + if(in_array_strict($key,array("FAIpackageList"))) { ksort($entry['Entries']); foreach($entry['Entries'] as $data){ $str .=""; @@ -333,7 +333,7 @@ class faiSummaryTab extends plugin{ } /* Create partition table entries */ - if(in_array($key,array("FAIpartitionTable"))) { + if(in_array_strict($key,array("FAIpartitionTable"))) { foreach($entry['Entries'] as $cn => $data){ $str .= ""; $str .= $image." ".$data['name']; @@ -407,7 +407,7 @@ class faiSummaryTab extends plugin{ while($attrs = $ldap->fetch()){ foreach($this-> objs as $key => $rest){ - if(in_array($key,$attrs['objectClass'])){ + if(in_array_strict($key,$attrs['objectClass'])){ if(!isset($this->usedClasses[$key][$class])){ $this->usedClasses[$key][$class] = true; diff --git a/gosa-plugins/fai/admin/fai/class_filterFAI.inc b/gosa-plugins/fai/admin/fai/class_filterFAI.inc index 5f1065ce3..d102d80cf 100644 --- a/gosa-plugins/fai/admin/fai/class_filterFAI.inc +++ b/gosa-plugins/fai/admin/fai/class_filterFAI.inc @@ -42,7 +42,7 @@ class filterFAI extends filterLDAP{ $acl = $ui->get_permissions($object['dn'],"fai/".$rest ['ACL']); - if(in_array($type,$object['objectClass']) && preg_match("/r/",$acl)){ + if(in_array_strict($type,$object['objectClass']) && preg_match("/r/",$acl)){ /* Prepare object */ unset($object['objectClass']['count']); diff --git a/gosa-plugins/fai/admin/fai/class_filterOPSIPackages.inc b/gosa-plugins/fai/admin/fai/class_filterOPSIPackages.inc index e17121634..53c4f65ac 100644 --- a/gosa-plugins/fai/admin/fai/class_filterOPSIPackages.inc +++ b/gosa-plugins/fai/admin/fai/class_filterOPSIPackages.inc @@ -61,7 +61,7 @@ class filterOPSIPackages extends filterLDAP{ $data = array_pop($data); // Display only requested object types - if(!in_array($data['type'], $types)) continue; + if(!in_array_strict($data['type'], $types)) continue; // Filter out those entries that doesn't match the filter. if(!preg_match("/".$filter."/i", $data['cn'])){ diff --git a/gosa-plugins/fai/admin/fai/packageSelect/class_filterFAIPackages.inc b/gosa-plugins/fai/admin/fai/packageSelect/class_filterFAIPackages.inc index 5dd6232a4..a992bd1f1 100644 --- a/gosa-plugins/fai/admin/fai/packageSelect/class_filterFAIPackages.inc +++ b/gosa-plugins/fai/admin/fai/packageSelect/class_filterFAIPackages.inc @@ -44,7 +44,7 @@ class filterFAIPackages { if(isset($entry[$attr_name])){ $test = $entry[$attr_name]; if(!is_array($test)) $test = array($test); - if(in_array($match, $test)) unset($entries[$id]); + if(in_array_strict($match, $test)) unset($entries[$id]); } } } diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc index 6507ba07a..34b3f7c5a 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc @@ -43,14 +43,14 @@ class blocklistGeneric extends plugin $this->readonly = TRUE; /* Get blocklist type and defined numbers */ - if (in_array("goFaxSBlock",$this->attrs['objectClass'])){ + if (in_array_strict("goFaxSBlock",$this->attrs['objectClass'])){ if(isset($this->attrs["goFaxSBlocklist"])){ for ($i= 0; $i<$this->attrs["goFaxSBlocklist"]["count"]; $i++){ $this->goFaxBlocklist[]= $this->attrs["goFaxSBlocklist"][$i]; } } $this->type= BLOCK_LIST_SEND; - } elseif (in_array("goFaxRBlock",$this->attrs['objectClass'])){ + } elseif (in_array_strict("goFaxRBlock",$this->attrs['objectClass'])){ if(isset($this->attrs["goFaxRBlocklist"])){ for ($i= 0; $i<$this->attrs["goFaxRBlocklist"]["count"]; $i++){ $this->goFaxBlocklist[]= $this->attrs["goFaxRBlocklist"][$i]; @@ -179,7 +179,7 @@ class blocklistGeneric extends plugin $tmp = $this->attributes; $tmp[] = "type"; foreach($tmp as $attr){ - if(in_array($attr,array("cn","type")) && $this->readonly){ + if(in_array_strict($attr,array("cn","type")) && $this->readonly){ continue; }elseif(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){ $this->$attr = get_post($attr); @@ -289,7 +289,7 @@ class blocklistGeneric extends plugin /* Add number */ function addNumber($number) { - if (!in_array($number, $this->goFaxBlocklist)){ + if (!in_array_strict($number, $this->goFaxBlocklist)){ $this->goFaxBlocklist[]= $number; sort($this->goFaxBlocklist); } @@ -301,7 +301,7 @@ class blocklistGeneric extends plugin { $tmp= array(); foreach ($this->goFaxBlocklist as $val){ - if (!in_array($val, $numbers)){ + if (!in_array_strict($val, $numbers)){ $tmp[]= $val; } } @@ -336,14 +336,14 @@ class blocklistGeneric extends plugin $this->readonly = TRUE; /* Get blocklist type and defined numbers */ - if (in_array("goFaxSBlock",$source['objectClass'])){ + if (in_array_strict("goFaxSBlock",$source['objectClass'])){ if(isset($source["goFaxSBlocklist"])){ for ($i= 0; $i<$source["goFaxSBlocklist"]["count"]; $i++){ $this->goFaxBlocklist[]= $source["goFaxSBlocklist"][$i]; } } $this->type= BLOCK_LIST_SEND; - } elseif (in_array("goFaxRBlock",$source['objectClass'])){ + } elseif (in_array_strict("goFaxRBlock",$source['objectClass'])){ if(isset($source["goFaxRBlocklist"])){ for ($i= 0; $i<$source["goFaxRBlocklist"]["count"]; $i++){ $this->goFaxBlocklist[]= $source["goFaxRBlocklist"][$i]; diff --git a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc index 8a065436f..65ca2b134 100644 --- a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc +++ b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc @@ -78,7 +78,7 @@ class gofaxAccount extends plugin } /* Set up has_mailAccount */ - if (in_array("gosaMailAccount", $this->attrs['objectClass'])){ + if (in_array_strict("gosaMailAccount", $this->attrs['objectClass'])){ $this->has_mailAccount= TRUE; } } @@ -286,7 +286,7 @@ class gofaxAccount extends plugin if (isset($_POST['delete_blocklist_number']) && isset($_POST['block_list'])){ $tmp= array(); foreach($this->current_blocklist as $val){ - if (!in_array($val, $_POST['block_list'])){ + if (!in_array_strict($val, $_POST['block_list'])){ $tmp[]= $val; } } @@ -559,14 +559,14 @@ class gofaxAccount extends plugin } foreach($this->attributes as $attr){ - if(in_array($attr,$this->multi_boxes)) { + if(in_array_strict($attr,$this->multi_boxes)) { $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); } } foreach(array("goFaxIsEnabled","edit_outgoing","edit_incoming","faxtomail","faxtoprinter") as $attr){ - if(in_array($attr,$this->multi_boxes)) { + if(in_array_strict($attr,$this->multi_boxes)) { $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); @@ -754,7 +754,7 @@ class gofaxAccount extends plugin foreach (array("goFaxRBlocklist", "goFaxRBlockgroups", "goFaxSBlocklist", "goFaxSBlockgroups", "facsimileAlternateTelephoneNumber") as $val){ - if (in_array($val, $skip)){ + if (in_array_strict($val, $skip)){ continue; } @@ -852,14 +852,14 @@ class gofaxAccount extends plugin } $tmp = 0+$this->goFaxDeliveryMode; - if(in_array("faxtomail",$this->multi_boxes)){ + if(in_array_strict("faxtomail",$this->multi_boxes)){ if (isset($_POST["faxtomail"]) && $_POST["faxtomail"] == 1){ $tmp |= 32; }elseif($tmp & 32){ $tmp &= (!32); } } - if(in_array("faxtoprinter",$this->multi_boxes)){ + if(in_array_strict("faxtoprinter",$this->multi_boxes)){ if (isset($_POST["faxtoprinter"]) && $_POST["faxtoprinter"] == 1){ $tmp |= 64; }elseif($tmp & 64){ @@ -873,7 +873,7 @@ class gofaxAccount extends plugin } else { $this->goFaxIsEnabled= "1"; } - if (isset($_POST['mail']) && in_array("mail",$this->multi_boxes)){ + if (isset($_POST['mail']) && in_array_strict("mail",$this->multi_boxes)){ $this->mail= get_post('mail'); } } @@ -882,21 +882,21 @@ class gofaxAccount extends plugin function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("goFaxIsEnabled",$this->multi_boxes)){ + if(in_array_strict("goFaxIsEnabled",$this->multi_boxes)){ $ret['goFaxIsEnabled'] = $this->goFaxIsEnabled; } - if(in_array("faxtoprinter",$this->multi_boxes)){ + if(in_array_strict("faxtoprinter",$this->multi_boxes)){ $ret['faxtoprinter'] = $this->goFaxDeliveryMode & 64; } - if(in_array("faxtomail",$this->multi_boxes)){ + if(in_array_strict("faxtomail",$this->multi_boxes)){ $ret['faxtomail'] = $this->goFaxDeliveryMode & 32; } - if(in_array("edit_incoming",$this->multi_boxes)){ + if(in_array_strict("edit_incoming",$this->multi_boxes)){ $ret['goFaxRBlocklist'] = $this->goFaxRBlocklist; $ret['goFaxRBlockgroups'] = $this->goFaxRBlockgroups; } - if(in_array("edit_outgoing",$this->multi_boxes)){ + if(in_array_strict("edit_outgoing",$this->multi_boxes)){ $ret['goFaxSBlocklist'] = $this->goFaxSBlocklist; $ret['goFaxSBlockgroups'] = $this->goFaxSBlockgroups; } diff --git a/gosa-plugins/gofon/admin/ogroups/gofon/class_phonequeue.inc b/gosa-plugins/gofon/admin/ogroups/gofon/class_phonequeue.inc index a798c7efb..426675e0a 100644 --- a/gosa-plugins/gofon/admin/ogroups/gofon/class_phonequeue.inc +++ b/gosa-plugins/gofon/admin/ogroups/gofon/class_phonequeue.inc @@ -220,7 +220,7 @@ class phonequeue extends plugin /* Add queue number */ if(isset($_POST['add_phonenumber'])&&(isset($_POST['phonenumber']))&&(!empty($_POST['phonenumber']))){ - if((!in_array($_POST['phonenumber'],$this->telephoneNumber))&&(is_numeric($_POST['phonenumber']))){ + if((!in_array_strict($_POST['phonenumber'],$this->telephoneNumber))&&(is_numeric($_POST['phonenumber']))){ $this->telephoneNumber[]=get_post('phonenumber'); } } @@ -549,7 +549,7 @@ class phonequeue extends plugin $obj = $ldap->fetch(); /* Calculate server and account dependencies */ - $is_acc = in_array("goFonAccount",$obj['objectClass']); + $is_acc = in_array_strict("goFonAccount",$obj['objectClass']); $is_home= isset($obj['goFonHomeServer'][0]) && $obj['goFonHomeServer'][0] == $this->goFonHomeServer; /* Append user to list of queue member, diff --git a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc index dfade6851..200d5d49d 100644 --- a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc +++ b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc @@ -209,7 +209,7 @@ class phoneGeneric extends plugin /* deativate all fields that are not used by the specified type */ foreach($this->attributes as $att){ - if((!in_array($att,$this->usedattrs[$this->selected_category]))){ + if((!in_array_strict($att,$this->usedattrs[$this->selected_category]))){ $smarty->assign($att."USED", "disabled" ); $smarty->assign($att, ""); }else{ @@ -377,7 +377,7 @@ class phoneGeneric extends plugin foreach($this->attributes as $att){ /* Check all attributes, if they are needed for this type of phone */ - if(!in_array($att,$this->usedattrs[$mode])){ + if(!in_array_strict($att,$this->usedattrs[$mode])){ $this->attrs[$att] = array(); } } diff --git a/gosa-plugins/gofon/admin/systems/services/gofon/class_goFonServer.inc b/gosa-plugins/gofon/admin/systems/services/gofon/class_goFonServer.inc index 85822332b..6c707f4d1 100644 --- a/gosa-plugins/gofon/admin/systems/services/gofon/class_goFonServer.inc +++ b/gosa-plugins/gofon/admin/systems/services/gofon/class_goFonServer.inc @@ -130,7 +130,7 @@ class goFonServer extends goService{ /* Update goFonAccounts if server was is renamed. Set attribute goFonHomeServer to current dn */ - if(in_array("goFonServer",$this->objectclasses)){ + if(in_array_strict("goFonServer",$this->objectclasses)){ if($this->orig_dn != "new" && $this->orig_dn != $this->dn){ $ldap = $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc index 75da3a7e9..8117ceae2 100644 --- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc +++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc @@ -345,7 +345,7 @@ class macroParameter extends plugin } switch($val['type']){ case 'bool' : $possible = array("","0","1"); - if(!in_array($val['default'],$possible)) { + if(!in_array_strict($val['default'],$possible)) { $message[] = sprintf(_("Parameter %s is invalid!"),$val['name']); };break; case 'string' : diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc index 872faefff..330f21f84 100644 --- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc +++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc @@ -1329,7 +1329,7 @@ class phoneAccount extends plugin foreach($this->attributes as $attr){ - if(in_array($attr,$this->multi_boxes)){ + if(in_array_strict($attr,$this->multi_boxes)){ $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); @@ -1337,7 +1337,7 @@ class phoneAccount extends plugin } foreach(array("goFonVoiceMailContext","goFonContext") as $attr){ - if(in_array($attr,$this->multi_boxes)){ + if(in_array_strict($attr,$this->multi_boxes)){ $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); @@ -1603,7 +1603,7 @@ class phoneAccount extends plugin plugin::adapt_from_template($dn, $skip); /* Assemble phone numbers */ - if (isset($this->attrs['telephoneNumber']) && !in_array("telephoneNumber", $skip)){ + if (isset($this->attrs['telephoneNumber']) && !in_array_strict("telephoneNumber", $skip)){ for ($i= 0; $i<$this->attrs['telephoneNumber']['count']; $i++){ $number= $this->attrs['telephoneNumber'][$i]; $this->phoneNumbers[$number]= $number; @@ -1747,7 +1747,7 @@ class phoneAccount extends plugin $ldap->cd($this->config->current['BASE']); $ldap->search("(&(objectClass=goFonQueue)(member=*))", array("member")); while($attr = $ldap->fetch()){ - if(in_array($this->dn,$attr['member'])){ + if(in_array_strict($this->dn,$attr['member'])){ $new =new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'],$attr['dn']); unset($new->by_object['ogroup']->memberList[$this->dn]); unset($new->by_object['ogroup']->member[$this->dn]); @@ -1949,30 +1949,30 @@ class phoneAccount extends plugin { $message = plugin::multiple_check(); - if(!count($this->goFonHomeServers) && in_array("goFonHomeServers",$this->multi_boxes)){ + if(!count($this->goFonHomeServers) && in_array_strict("goFonHomeServers",$this->multi_boxes)){ $message[] = _("There is currently no asterisk server defined!"); } - if(empty($this->goFonHomeServer) && in_array("goFonHomeServers",$this->multi_boxes)){ + if(empty($this->goFonHomeServer) && in_array_strict("goFonHomeServers",$this->multi_boxes)){ $message[] = _("Asterisk server is invalid!"); } - if(in_array("goFonVoicemailPIN",$this->multi_boxes) && + if(in_array_strict("goFonVoicemailPIN",$this->multi_boxes) && ( (strlen($this->goFonVoicemailPIN)==0)|| (strlen($this->goFonVoicemailPIN)>4))){ $message[]=(_("Voice mail PIN must be 4 characters long!")); }else{ - if(preg_match("/[^0-9]/",$this->goFonVoicemailPIN) && in_array("goFonVoicemailPIN",$this->multi_boxes) ){ + if(preg_match("/[^0-9]/",$this->goFonVoicemailPIN) && in_array_strict("goFonVoicemailPIN",$this->multi_boxes) ){ $message[]=(_("Voice mail PIN contains invalid characters!")); } } - if(preg_match("/[^0-9a-z]/i",$this->goFonPIN) && in_array("goFonPIN",$this->multi_boxes)){ + if(preg_match("/[^0-9a-z]/i",$this->goFonPIN) && in_array_strict("goFonPIN",$this->multi_boxes)){ $message[]=(_("Phone PIN contains invalid characters!")); } /* check for ! in any parameter setting*/ - if(isset($this->macroarray[$this->macro]) && in_array("macro",$this->multi_boxes)){ + if(isset($this->macroarray[$this->macro]) && in_array_strict("macro",$this->multi_boxes)){ foreach($this->macroarray[$this->macro] as $val){ if((strstr($val['choosen'],"!"))||(strstr($val['choosen'],"#"))){ $message[] = sprintf(_("The parameter %s contains invalid char. '!,#' is used as delimiter"),$val['name']); @@ -1986,7 +1986,7 @@ class phoneAccount extends plugin function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("macro",$this->multi_boxes)){ + if(in_array_strict("macro",$this->multi_boxes)){ $ret['macro'] = $this->macro; $ret['macroarray'] = $this->macroarray; $ret['macros'] = $this->macros; diff --git a/gosa-plugins/goto-ng/admin/newConfigManagement/class_ConfigManagementDataModel.inc b/gosa-plugins/goto-ng/admin/newConfigManagement/class_ConfigManagementDataModel.inc index a4cc53143..8f89e66eb 100644 --- a/gosa-plugins/goto-ng/admin/newConfigManagement/class_ConfigManagementDataModel.inc +++ b/gosa-plugins/goto-ng/admin/newConfigManagement/class_ConfigManagementDataModel.inc @@ -94,7 +94,7 @@ class ConfigManagementDataModel { $res = array(); foreach($this->data['linear'] as $path => $item){ - if(in_array($item['type'],$types)) $res[] = $item; + if(in_array_strict($item['type'],$types)) $res[] = $item; } return($res); } diff --git a/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc b/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc index dda5975ef..66aadf839 100644 --- a/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc +++ b/gosa-plugins/goto-ng/admin/newConfigManagement/class_newConfigManagement.inc @@ -226,7 +226,7 @@ class newConfigManagement extends plugin function __recurseItem($item, $types, $parent = "") { $res = array(); - if(in_array($item['type'], $types)){ + if(in_array_strict($item['type'], $types)){ $path = preg_replace("/".preg_quote($parent,'/')."/","",$item['path']); $res[$path] = array('name' => $item['name'],'desc'=>$item['type']); } @@ -331,9 +331,9 @@ class newConfigManagement extends plugin $id = $ids[0]; $item = $this->dataModel->getItemById($id); if($item){ - if(in_array($item['type'], array('Distribution', 'Release'))){ + if(in_array_strict($item['type'], array('Distribution', 'Release'))){ $this->setCurrentContainer($item['path'], $this->selectedItem); - }elseif(in_array($item['type'], array('Component'))){ + }elseif(in_array_strict($item['type'], array('Component'))){ $next = preg_replace("/".preg_quote($this->selectedContainer,'/')."/","", $item['path']); $this->setCurrentContainer($this->selectedContainer, $next); }else{ diff --git a/gosa-plugins/goto/addons/goto/class_filterGotoEvents.inc b/gosa-plugins/goto/addons/goto/class_filterGotoEvents.inc index d81a227e1..3ac29153e 100644 --- a/gosa-plugins/goto/addons/goto/class_filterGotoEvents.inc +++ b/gosa-plugins/goto/addons/goto/class_filterGotoEvents.inc @@ -37,7 +37,7 @@ class filterGotoEvents extends filterLDAP { /* If WAITING add priority action */ - if(in_array($entry['STATUS'],array("waiting")) && $acl_is_writeable){ + if(in_array_strict($entry['STATUS'],array("waiting")) && $acl_is_writeable){ $entry['objectClass'][] = "FAKE_OC__prioUp"; $entry['objectClass'][] = "FAKE_OC__prioDown"; $entry['objectClass'][] = "FAKE_OC__prioPause"; @@ -45,13 +45,13 @@ class filterGotoEvents extends filterLDAP { /* If PAUSED add resume action */ - if(in_array($entry['STATUS'],array("paused")) && $acl_is_writeable){ + if(in_array_strict($entry['STATUS'],array("paused")) && $acl_is_writeable){ $entry['objectClass'][] = "FAKE_OC__prioResume"; } /* If PAUSED or WAITING add execution action */ - if(in_array($entry['STATUS'],array("paused","waiting")) && $acl_is_writeable){ + if(in_array_strict($entry['STATUS'],array("paused","waiting")) && $acl_is_writeable){ $entry['objectClass'][] = "FAKE_OC__processNow"; } @@ -63,23 +63,23 @@ class filterGotoEvents extends filterLDAP { /* If PAUSED or WAITING add edit action */ - if(in_array($entry['STATUS'],array("waiting")) && $acl_is_writeable){ + if(in_array_strict($entry['STATUS'],array("waiting")) && $acl_is_writeable){ $entry['objectClass'][] = "FAKE_OC__edit"; } /* If PROCESSING add abort action */ - if(in_array($entry['STATUS'],array("processing")) && preg_match("/install/",$entry['HEADERTAG']) && $acl_is_writeable){ + if(in_array_strict($entry['STATUS'],array("processing")) && preg_match("/install/",$entry['HEADERTAG']) && $acl_is_writeable){ $entry['objectClass'][] = "FAKE_OC__abort"; } /* If WAITING or ERROR add remove action */ - if( $acl_is_removeable && in_array($entry['STATUS'],array("waiting","error","processed"))){ + if( $acl_is_removeable && in_array_strict($entry['STATUS'],array("waiting","error","processed"))){ $entry['objectClass'][] = "FAKE_OC__remove"; } - if($acl_is_writeable && in_array($entry['STATUS'],array("processing")) && !preg_match("/install/",$entry['HEADERTAG'])){ + if($acl_is_writeable && in_array_strict($entry['STATUS'],array("processing")) && !preg_match("/install/",$entry['HEADERTAG'])){ $entry['objectClass'][] = "FAKE_OC__remove"; } @@ -101,7 +101,7 @@ class filterGotoEvents extends filterLDAP { # /* Skip entries which will be removed within the next seconds */ -# if(isset($entry['MACADDRESS']) && in_array($entry['MACADDRESS'],$recently_removed)){ +# if(isset($entry['MACADDRESS']) && in_array_strict($entry['MACADDRESS'],$recently_removed)){ # continue; # } $data[] = $item; diff --git a/gosa-plugins/goto/addons/goto/class_gotoLogView.inc b/gosa-plugins/goto/addons/goto/class_gotoLogView.inc index a0196eb1b..ac03a2338 100644 --- a/gosa-plugins/goto/addons/goto/class_gotoLogView.inc +++ b/gosa-plugins/goto/addons/goto/class_gotoLogView.inc @@ -166,7 +166,7 @@ class gotoLogView extends plugin $this->$dest = $_GET[$attr]; } } - if(isset($_GET['sort_by']) && in_array($_GET['sort_by'],array("file","time"))){ + if(isset($_GET['sort_by']) && in_array_strict($_GET['sort_by'],array("file","time"))){ if($_GET['sort_by'] == $this->sort_by){ $this->sort_dir = !$this->sort_dir; } diff --git a/gosa-plugins/goto/addons/goto/class_goto_import_file.inc b/gosa-plugins/goto/addons/goto/class_goto_import_file.inc index 5b0795a48..8f1cd9085 100644 --- a/gosa-plugins/goto/addons/goto/class_goto_import_file.inc +++ b/gosa-plugins/goto/addons/goto/class_goto_import_file.inc @@ -142,7 +142,7 @@ class goto_import_file extends plugin $evts = $this->events; foreach($this->events as $id => $evt){ foreach($evt as $key => $val){ - if(in_array($key,$this->csv_fields)){ + if(in_array_strict($key,$this->csv_fields)){ $evts[$id][$key] = "".strip_tags($val).""; } } diff --git a/gosa-plugins/goto/addons/goto/class_gotomasses.inc b/gosa-plugins/goto/addons/goto/class_gotomasses.inc index 23df6ee46..46c0cffae 100644 --- a/gosa-plugins/goto/addons/goto/class_gotomasses.inc +++ b/gosa-plugins/goto/addons/goto/class_gotomasses.inc @@ -246,7 +246,7 @@ class gotomasses extends management } /* Only remove WAITING or ERROR entries */ - if(in_array($task['STATUS'],array("waiting","error","processed")) || + if(in_array_strict($task['STATUS'],array("waiting","error","processed")) || ($task['STATUS'] == "processing" && !preg_match("/install/",$task['HEADERTAG'])) ){ $this->ids_to_remove[] = $task['ID']; $deleteable_jobs[] = $j_name; @@ -503,7 +503,7 @@ class gotomasses extends management foreach($ids as $id){ $tmp = $headpage->getEntry($id); $entry = $tmp['EVENT']; - if(in_array($entry['STATUS'],array("paused","waiting"))){ + if(in_array_strict($entry['STATUS'],array("paused","waiting"))){ $update_ids[] = $entry['ID']; } } diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc index f711b7b23..21137c731 100644 --- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc +++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc @@ -573,7 +573,7 @@ class DaemonEvent public function set_value($name,$value) { $name = strtolower($name); - if(isset($this->$name) && in_array($name,$this->attributes)){ + if(isset($this->$name) && in_array_strict($name,$this->attributes)){ $this->$name = $value; } } diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc index 51ee3f218..889196c8e 100644 --- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc +++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc @@ -143,7 +143,7 @@ class DaemonEvent_notify extends DaemonEvent $add = array($add); } foreach($add as $target){ - if(!in_array($target,$this->user)){ + if(!in_array_strict($target,$this->user)){ $this->user[] = $target; } } @@ -157,7 +157,7 @@ class DaemonEvent_notify extends DaemonEvent $add = array($add); } foreach($add as $target){ - if(!in_array($target,$this->group)){ + if(!in_array_strict($target,$this->group)){ $this->group[] = $target; } } diff --git a/gosa-plugins/goto/addons/goto/events/class_EventAddSystemDialog.inc b/gosa-plugins/goto/addons/goto/events/class_EventAddSystemDialog.inc index 64c196d83..ac98b5c93 100644 --- a/gosa-plugins/goto/addons/goto/events/class_EventAddSystemDialog.inc +++ b/gosa-plugins/goto/addons/goto/events/class_EventAddSystemDialog.inc @@ -75,7 +75,7 @@ class EventAddSystemDialog extends management $member_dns = array(); foreach($entries as $entry){ $member_dns[] = $entry['dn']; - if(in_array("gosaGroupOfNames", $entry['objectClass'])){ + if(in_array_strict("gosaGroupOfNames", $entry['objectClass'])){ $ldap->cat($entry['dn']); if($ldap->count()){ $attrs = $ldap->fetch(); diff --git a/gosa-plugins/goto/addons/goto/events/class_EventAddUserDialog.inc b/gosa-plugins/goto/addons/goto/events/class_EventAddUserDialog.inc index 7c9417355..94c5990df 100644 --- a/gosa-plugins/goto/addons/goto/events/class_EventAddUserDialog.inc +++ b/gosa-plugins/goto/addons/goto/events/class_EventAddUserDialog.inc @@ -68,10 +68,10 @@ class EventAddUserDialog extends management $entries = $this->save(); $a_targets = array("USERS" => array(),"GROUPS" => array()); foreach($entries as $entry){ - if(in_array("posixGroup",$entry['objectClass'])){ + if(in_array_strict("posixGroup",$entry['objectClass'])){ $a_targets['GROUPS'][] = $entry['cn'][0]; } - if(in_array("gosaAccount",$entry['objectClass'])){ + if(in_array_strict("gosaAccount",$entry['objectClass'])){ $a_targets['USERS'][] = $entry['uid'][0]; } } diff --git a/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc b/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc index 5f0c18ca7..2c0918ee6 100644 --- a/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc +++ b/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc @@ -510,7 +510,7 @@ class ConfigManagement extends management // Add sub-module requested. if(isset($_POST['addSubModule']) && isset($_POST['subModule'])){ $sub = get_post('subModule'); - if(in_array($sub, $this->currentItemDescriptor['container'])){ + if(in_array_strict($sub, $this->currentItemDescriptor['container'])){ // Check if this is a valid item if(!isset($this->itemConfig[$sub])) { diff --git a/gosa-plugins/goto/admin/ConfigManagement/class_TemplateWidget_fixedList.inc b/gosa-plugins/goto/admin/ConfigManagement/class_TemplateWidget_fixedList.inc index 0f9809728..a0e9bd023 100644 --- a/gosa-plugins/goto/admin/ConfigManagement/class_TemplateWidget_fixedList.inc +++ b/gosa-plugins/goto/admin/ConfigManagement/class_TemplateWidget_fixedList.inc @@ -21,7 +21,7 @@ class TemplateWidget_fixedList extends TemplateWidget { $tmp = array(); foreach($this->values as $key => $name){ - if(!in_array($key, $this->value)){ + if(!in_array_strict($key, $this->value)){ $tmp[$key]=$name; } } diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc index 14d4d7757..c89059640 100644 --- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc +++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc @@ -315,7 +315,7 @@ class appgroup extends plugin /* Add a menu folder */ - if(in_array("gotoSubmenuEntry",$attrs['objectClass'])){ + if(in_array_strict("gotoSubmenuEntry",$attrs['objectClass'])){ $type = "FOLDER"; $data['ICON'] = ""; @@ -325,7 +325,7 @@ class appgroup extends plugin /* Add a menu entry */ - }elseif(in_array("gotoMenuEntry",$attrs['objectClass'])){ + }elseif(in_array_strict("gotoMenuEntry",$attrs['objectClass'])){ $type = "ENTRY"; $data['INFO'] = ""; @@ -345,7 +345,7 @@ class appgroup extends plugin /* Add a release */ - }elseif(in_array("FAIbranch",$attrs['objectClass'])){ + }elseif(in_array_strict("FAIbranch",$attrs['objectClass'])){ $type = "RELEASE"; if(isset($attrs['FAIstate'][0])){ $data['FAIstate'] = $attrs['FAIstate'][0]; @@ -465,7 +465,7 @@ class appgroup extends plugin // Add applications found on this base $used_apps = $this->_get_used_entry_name(); foreach($this->apps as $key => $app){ - if(in_array($app['cn'][0],$used_apps)) continue; + if(in_array_strict($app['cn'][0],$used_apps)) continue; if(!preg_match("/".get_ou("application", "applicationRDN").preg_quote($this->curbase, '/')."$/",$app['dn'])){ continue; } @@ -758,7 +758,7 @@ class appgroup extends plugin break; } } - while(isset($all_l[$i]) && !in_array($all_l[$i]['TYPE'],array("ENTRY","FOLDER","CLOSE","OPEN")) && $i < count($all_l)){ + while(isset($all_l[$i]) && !in_array_strict($all_l[$i]['TYPE'],array("ENTRY","FOLDER","CLOSE","OPEN")) && $i < count($all_l)){ $i++; } @@ -766,7 +766,7 @@ class appgroup extends plugin return(FALSE); } - if(in_array($all_l[$i]['TYPE'],array("CLOSE","OPEN"))){ + if(in_array_strict($all_l[$i]['TYPE'],array("CLOSE","OPEN"))){ return($all_l[$i]['PARENT']); } @@ -791,14 +791,14 @@ class appgroup extends plugin $i++; } }else{ - while(isset($all_l[$i]) && !in_array($all_l[$i]['TYPE'],array("ENTRY","FOLDER")) && $i < count($all_l)){ + while(isset($all_l[$i]) && !in_array_strict($all_l[$i]['TYPE'],array("ENTRY","FOLDER")) && $i < count($all_l)){ $i++; } } if(!isset($all_l[$i])){ return(FALSE); } - if(in_array($all_l[$i]['TYPE'],array("CLOSE","OPEN"))){ + if(in_array_strict($all_l[$i]['TYPE'],array("CLOSE","OPEN"))){ return($all_l[$i]['PARENT']); } return($all_l[$i]['UNIQID']); @@ -831,7 +831,7 @@ class appgroup extends plugin $menu = $all[$source_rel]['ENTRIES']; foreach($menu as $entry){ - if(in_array($entry['TYPE'],array("FOLDER","ENTRY","SEPERATOR"))){ + if(in_array_strict($entry['TYPE'],array("FOLDER","ENTRY","SEPERATOR"))){ $this->_add_entry($current_rel,$entry,-1); } } @@ -1296,7 +1296,7 @@ class appgroup extends plugin if(isset($entry['LDAP_ATTRS'])){ for($i = 0 ; $i < $entry['LDAP_ATTRS']['objectClass']['count']; $i ++){ $oc = $entry['LDAP_ATTRS']['objectClass'][$i]; - if(!in_array($oc,$attrs['objectClass'])){ + if(!in_array_strict($oc,$attrs['objectClass'])){ $attrs['objectClass'][] = $oc; } } @@ -1442,7 +1442,7 @@ class appgroup extends plugin { $ret = plugin::get_multi_edit_values(); - if(in_array("apps",$this->multi_boxes)){ + if(in_array_strict("apps",$this->multi_boxes)){ $ret['gosaApplicationParameter'] = $this->gosaApplicationParameter; $ret['Categories'] = $this->Categories; $ret['gosaMemberApplication'] = $this->gosaMemberApplication; diff --git a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc index e583d72fd..86a2dd710 100644 --- a/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc +++ b/gosa-plugins/goto/admin/mimetypes/class_mimetypeGeneric.inc @@ -234,7 +234,7 @@ class mimetype extends plugin if(isset($_POST['NewApplication']) && !empty($_POST['NewApplication'])){ $str = trim(get_post("NewApplication")); } - if($str != "" && !in_array($str,$this->use_gotoMimeApplication)){ + if($str != "" && !in_array_strict($str,$this->use_gotoMimeApplication)){ $this->use_gotoMimeApplication[] = $str; } } @@ -253,7 +253,7 @@ class mimetype extends plugin if(isset($_POST['NewEmbeddedApplication']) && !empty($_POST['NewEmbeddedApplication'])){ $str = trim(get_post('NewEmbeddedApplication')); } - if($str != "" && !in_array($str,$this->use_gotoMimeEmbeddedApplication)){ + if($str != "" && !in_array_strict($str,$this->use_gotoMimeEmbeddedApplication)){ $this->use_gotoMimeEmbeddedApplication[] = $str; } } @@ -329,15 +329,15 @@ class mimetype extends plugin $this->embeddedList->save_object(); $action=$this->patternList->getAction(); - if(in_array($action['action'],array('delete', 'reorder'))){ + if(in_array_strict($action['action'],array('delete', 'reorder'))){ $this->use_gotoMimeFilePattern = array_values($this->patternList->getMaintainedData()); } $action=$this->applicationList->getAction(); - if(in_array($action['action'],array('delete', 'reorder'))){ + if(in_array_strict($action['action'],array('delete', 'reorder'))){ $this->use_gotoMimeApplication = array_values($this->applicationList->getMaintainedData()); } $action=$this->embeddedList->getAction(); - if(in_array($action['action'],array('delete', 'reorder'))){ + if(in_array_strict($action['action'],array('delete', 'reorder'))){ $this->use_gotoMimeEmbeddedApplication = array_values($this->embeddedList->getMaintainedData()); } diff --git a/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc b/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc index fe2496c6b..2ea00f50e 100644 --- a/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc +++ b/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc @@ -65,8 +65,8 @@ class termgroup extends plugin $ldap->cat($member, array('objectClass', 'macAddress', 'cn')); if ($ldap->success()){ $attrs = $ldap->fetch(); - if (in_array("gotoTerminal", $attrs['objectClass']) || - in_array("gotoWorkstation", $attrs['objectClass'])){ + if (in_array_strict("gotoTerminal", $attrs['objectClass']) || + in_array_strict("gotoWorkstation", $attrs['objectClass'])){ if (isset($attrs['macAddress'])){ $this->members[$attrs['cn'][0]]= $attrs['macAddress'][0]; } else { @@ -118,7 +118,7 @@ class termgroup extends plugin $this->nfsservers= $tmp2; /* Set inherit checkbox state */ - if(in_array("default",$this->gotoNtpServer)){ + if(in_array_strict("default",$this->gotoNtpServer)){ $this->inheritTimeServer = true; $this->gotoNtpServer=array(); } @@ -272,7 +272,7 @@ class termgroup extends plugin $tmp = array(); foreach($this->gotoNtpServers as $server){ - if(!in_array($server,$this->gotoNtpServer)){ + if(!in_array_strict($server,$this->gotoNtpServer)){ $tmp[$server] = $server; } } @@ -426,7 +426,7 @@ class termgroup extends plugin } /* Set inherit checkbox state */ - if(in_array("default",$this->gotoNtpServer)){ + if(in_array_strict("default",$this->gotoNtpServer)){ $this->inheritTimeServer = true; $this->gotoNtpServer=array(); } diff --git a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc index fe34a37ba..f7916dc73 100644 --- a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc +++ b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc @@ -95,7 +95,7 @@ class InstallRecipe extends plugin // Detect account status by checking the used objectClasses $this->is_account = FALSE; foreach($this->map as $type){ - if(in_array($type['objectClass'], $this->attrs['objectClass'])){ + if(in_array_strict($type['objectClass'], $this->attrs['objectClass'])){ $this->installBootstrapMethod = $type['bootstrap']; $this->installConfigManagement = $type['type']; $this->is_account = TRUE; @@ -381,7 +381,7 @@ class InstallRecipe extends plugin $this->installNTPServer = $this->installNTPServerList->getMaintainedData(); if(isset($_POST['installNTPServer_Input']) && isset($_POST['installNTPServer_Add'])){ $add = get_post('installNTPServer_Input'); - if(!in_array($add, $this->installNTPServer) && !empty($add)){ + if(!in_array_strict($add, $this->installNTPServer) && !empty($add)){ $this->installNTPServer[] = $add; } } diff --git a/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc b/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc index f0d9fb3c6..4c5ee7ce6 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_gotoLpdEnabled.inc @@ -228,7 +228,7 @@ class gotoLpdEnable extends plugin foreach($this->data as $entry){ $str = ""; foreach($attrs as $attr){ - if(in_array($attr,$serial_only) && $entry['s_Type'] != "Serial"){ + if(in_array_strict($attr,$serial_only) && $entry['s_Type'] != "Serial"){ $str .= ":"; }else{ $str .= $entry[$attr].":"; diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc index 11936d4f0..c0d13d93d 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc @@ -271,7 +271,7 @@ class printgeneric extends plugin if($ldap->count()){ $attrs = $ldap->fetch(); - if(in_array("gotoPrinter",$attrs['objectClass'])){ + if(in_array_strict("gotoPrinter",$attrs['objectClass'])){ $this->initially_was_account = true; $this->is_account = true; }else{ @@ -512,7 +512,7 @@ class printgeneric extends plugin $add = 'Admin'; } foreach($users as $user){ - if(in_array('gosaAccount', $user['objectClass'])){ + if(in_array_strict('gosaAccount', $user['objectClass'])){ $type = 'Add'.$add.'User'; }else{ $type = 'Add'.$add.'Group'; @@ -643,7 +643,7 @@ class printgeneric extends plugin /* Check if obejct is a printer */ $CheckPrinter = $ldap->fetch(); - if(!in_array("gotoPrinter",$CheckPrinter['objectClass'])){ + if(!in_array_strict("gotoPrinter",$CheckPrinter['objectClass'])){ msg_dialog::display(_("Error"), _("Object is no printer!"), ERROR_DIALOG); return; } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc index cb0220a34..2e5e3899e 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc @@ -100,7 +100,7 @@ class termgeneric extends plugin } /* Set inherit checkbox state */ - if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){ + if((in_array_strict("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){ $this->inheritTimeServer = true; $this->gotoNtpServer=array(); } @@ -276,7 +276,7 @@ class termgeneric extends plugin $tmp = array(); foreach($this->gotoNtpServers as $server){ - if(!in_array($server,$this->gotoNtpServer)){ + if(!in_array_strict($server,$this->gotoNtpServer)){ $tmp[$server] = $server; } } @@ -659,7 +659,7 @@ another location! */ } /* Set inherit checkbox state */ - if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){ + if((in_array_strict("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){ $this->inheritTimeServer = true; $this->gotoNtpServer=array(); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc index 7ee59c595..528088a73 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc @@ -333,7 +333,7 @@ class termservice extends plugin } if(isset($_POST['gotoXdmcpServer_add']) && isset($_POST['XdmcpAddServer'])){ - if(!in_array($_POST['gotoXdmcpServer_add'],$this->selected_xdmcp_servers)){ + if(!in_array_strict($_POST['gotoXdmcpServer_add'],$this->selected_xdmcp_servers)){ $this->selected_xdmcp_servers[] =get_post('gotoXdmcpServer_add'); } } @@ -341,7 +341,7 @@ class termservice extends plugin if(isset($_POST['selected_xdmcp_servers']) && isset($_POST['XdmcpDelServer'])){ $tmp = array(); foreach($this->selected_xdmcp_servers as $name){ - if(!in_array($name,$_POST['selected_xdmcp_servers'])){ + if(!in_array_strict($name,$_POST['selected_xdmcp_servers'])){ $tmp[] = $name; } } @@ -364,7 +364,7 @@ class termservice extends plugin $xdmcp_types = $this->config->data['SERVERS']['TERMINAL_SESSION_TYPES']; $available_servers = array(); foreach($xdmcp_types as $servername =>$supported_types){ - if(in_array(strtoupper($this->gotoXMethod),$supported_types)){ + if(in_array_strict(strtoupper($this->gotoXMethod),$supported_types)){ $available_servers[] = $servername; } } @@ -373,7 +373,7 @@ class termservice extends plugin */ $tmp = array(); foreach($this->selected_xdmcp_servers as $server){ - if(in_array($server,$available_servers)){ + if(in_array_strict($server,$available_servers)){ $tmp[$server] = $server; }else{ $tmp[$server] = $server." - "._("Unsupported"); @@ -536,12 +536,12 @@ class termservice extends plugin $xdmcp_types = $this->config->data['SERVERS']['TERMINAL_SESSION_TYPES']; $available_servers = array(); foreach($xdmcp_types as $servername =>$supported_types){ - if(in_array(strtoupper($this->gotoXMethod),$supported_types)){ + if(in_array_strict(strtoupper($this->gotoXMethod),$supported_types)){ $available_servers[] = $servername; } } foreach($this->selected_xdmcp_servers as $server){ - if(!in_array($server,$available_servers)){ + if(!in_array_strict($server,$available_servers)){ $message[] = _("Remote desktop settings contains servers that do not support the selected connection method."); break; } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc index 077eb7123..a368ae9b0 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc @@ -255,7 +255,7 @@ class termstartup extends plugin if(!$this->gotoLdap_inherit && isset($_POST['add_ldap_server']) && isset($_POST['ldap_server_to_add'])){ if(isset($this->gotoLdapServerList[$_POST['ldap_server_to_add']])){ $to_add = $this->gotoLdapServerList[$_POST['ldap_server_to_add']]; - if(!in_array($to_add,$this->gotoLdapServers)){ + if(!in_array_strict($to_add,$this->gotoLdapServers)){ $this->gotoLdapServers[] = $to_add; } } @@ -282,7 +282,7 @@ class termstartup extends plugin $data[$key]=$server; /* Announce missing entries */ - if(!in_array($server,$this->gotoLdapServerList)){ + if(!in_array_strict($server,$this->gotoLdapServerList)){ $server = $server." (missing)"; } @@ -308,7 +308,7 @@ class termstartup extends plugin $list = array(); foreach($this->gotoLdapServerList as $key => $entry){ - if(!in_array($entry,$this->gotoLdapServers)){ + if(!in_array_strict($entry,$this->gotoLdapServers)){ $list[$key] = $entry; } } @@ -442,7 +442,7 @@ class termstartup extends plugin { $tmp= array(); foreach ($array as $mod){ - if (!in_array($mod, $list)){ + if (!in_array_strict($mod, $list)){ $tmp[]= $mod; } } diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index db2febb4d..506c3cfaf 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -116,7 +116,7 @@ class workgeneric extends plugin } /* Set inherit checkbox state */ - if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer) == 0)){ + if((in_array_strict("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer) == 0)){ $this->inheritTimeServer = true; $this->gotoNtpServer=array(); } @@ -263,7 +263,7 @@ class workgeneric extends plugin $tmp = array(); foreach($this->gotoNtpServers as $server){ - if(!in_array($server,$this->gotoNtpServer)){ + if(!in_array_strict($server,$this->gotoNtpServer)){ $tmp[$server] = $server; } } @@ -303,7 +303,7 @@ class workgeneric extends plugin $ntpser = array(); foreach($this->gotoNtpServers as $server){ - if(!in_array($server,$this->gotoNtpServer)){ + if(!in_array_strict($server,$this->gotoNtpServer)){ $ntpser[$server] = set_post($server); } } @@ -682,7 +682,7 @@ class workgeneric extends plugin } /* Set inherit checkbox state */ - if((in_array("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){ + if((in_array_strict("default",$this->gotoNtpServer)) || (count($this->gotoNtpServer)==0)){ $this->inheritTimeServer = true; $this->gotoNtpServer=array(); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc index 8fa9eddc7..7945fd2fb 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -447,7 +447,7 @@ class workstartup extends plugin isset($_POST['ldap_server_to_add'])){ if(isset($this->gotoLdapServerList[get_post('ldap_server_to_add')])){ $to_add = $this->gotoLdapServerList[get_post('ldap_server_to_add')]; - if(!in_array($to_add,$this->gotoLdapServers)){ + if(!in_array_strict($to_add,$this->gotoLdapServers)){ $this->gotoLdapServers[] = $to_add; } } @@ -471,7 +471,7 @@ class workstartup extends plugin $data[$key]=$server; /* Announce missing entries */ - if(!in_array($server,$this->gotoLdapServerList)){ + if(!in_array_strict($server,$this->gotoLdapServerList)){ $server = $server." (missing)"; } @@ -495,7 +495,7 @@ class workstartup extends plugin $list = array(); foreach($this->gotoLdapServerList as $key => $entry){ - if(!in_array($entry,$this->gotoLdapServers)){ + if(!in_array_strict($entry,$this->gotoLdapServers)){ /* Convert old style entry */ if (!preg_match('%:ldap[s]*://%', $entry)){ @@ -868,7 +868,7 @@ another location! */ { $tmp= array(); foreach ($array as $mod){ - if (!in_array($mod, $list)){ + if (!in_array_strict($mod, $list)){ $tmp[]= $mod; } } @@ -1149,7 +1149,7 @@ another location! */ $Abbr =""; $ret= array(); foreach($classes as $class_name => $class_types){ - if(!in_array($class_name,$this->FAIclass)){ + if(!in_array_strict($class_name,$this->FAIclass)){ $Abbr = ""; foreach($class_types as $type){ if(!preg_match("/".$type['Abbr']."/",$Abbr)){ diff --git a/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc b/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc index 8160246ba..f732bd24a 100644 --- a/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc +++ b/gosa-plugins/goto/admin/systems/goto/tabs_printers.inc @@ -52,7 +52,7 @@ class printtabs extends tabs $baseobject= NULL; foreach($this->by_object as $name => $object){ $class = get_class($object); - if(in_array($class,array("reference","acl"))) continue; + if(in_array_strict($class,array("reference","acl"))) continue; if ($baseobject === NULL){ $baseobject= new $class($this->config, $this->dn,NULL,$this); $baseobject->enable_CSN_check(); diff --git a/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc b/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc index 68d30ea43..49c62d87e 100644 --- a/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc +++ b/gosa-plugins/goto/admin/systems/goto/tabs_terminal.inc @@ -51,7 +51,7 @@ class termtabs extends tabs $baseobject= NULL; foreach($this->by_object as $name => $object){ $class = get_class($object); - if(in_array($class,array("reference","acl"))) continue; + if(in_array_strict($class,array("reference","acl"))) continue; if ($baseobject === NULL){ $baseobject= new $class($this->config, $this->dn,NULL,$this); $baseobject->enable_CSN_check(); diff --git a/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc b/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc index 75f6bd4e9..f73c82112 100644 --- a/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc +++ b/gosa-plugins/goto/admin/systems/goto/tabs_workstation.inc @@ -54,7 +54,7 @@ class worktabs extends tabs $baseobject= NULL; foreach($this->by_object as $name => $object){ $class = get_class($object); - if(in_array($class,array("reference","acl"))) continue; + if(in_array_strict($class,array("reference","acl"))) continue; if ($baseobject === NULL){ $baseobject= new $class($this->config, $this->dn,NULL,$this); $baseobject->enable_CSN_check(); diff --git a/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc b/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc index d75fa472b..704366b49 100644 --- a/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc +++ b/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc @@ -211,7 +211,7 @@ class ppdManager trigger_error(_('Nested groups are not supported!'), E_USER_WARNING); continue; } - if (in_array($group, $properties)){ + if (in_array_strict($group, $properties)){ trigger_error(_('Group name not unique!'), E_USER_WARNING); continue; } diff --git a/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc b/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc index 8b49ea30b..0b93f966a 100644 --- a/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc +++ b/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc @@ -135,7 +135,7 @@ class goKioskService extends goService{ foreach($this->gotoKioskProfiles as $k){ $used[] = $k['name']; } - if(in_array($file['name'], $used)){ + if(in_array_strict($file['name'], $used)){ msg_dialog::display(_("Warning"), msgPool::duplicated(_("Profile")), WARNING_DIALOG); }else{ $this->gotoKioskProfiles[] = $tmp; diff --git a/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc b/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc index ecfaf6110..48f9b035e 100644 --- a/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc +++ b/gosa-plugins/goto/admin/systems/services/shares/class_servNfs.inc @@ -189,7 +189,7 @@ class servnfs extends plugin } } - if(!in_array($this->type,$this->types)){ + if(!in_array_strict($this->type,$this->types)){ $message[]= msgPool::required(_("Type")); } diff --git a/gosa-plugins/goto/admin/systems/services/terminal/class_goTerminalServer.inc b/gosa-plugins/goto/admin/systems/services/terminal/class_goTerminalServer.inc index 793c91465..40ec0d83d 100644 --- a/gosa-plugins/goto/admin/systems/services/terminal/class_goTerminalServer.inc +++ b/gosa-plugins/goto/admin/systems/services/terminal/class_goTerminalServer.inc @@ -58,7 +58,7 @@ class goTerminalServer extends goService{ $tmp = array(); foreach($this->gotoSessionTypes as $type){ - if(in_array($type,$this->gotoSessionType)){ + if(in_array_strict($type,$this->gotoSessionType)){ $tmp[$type] = TRUE; }else{ $tmp[$type] = FALSE; diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc index a82e5d409..9c7fccefa 100644 --- a/gosa-plugins/goto/personal/environment/class_environment.inc +++ b/gosa-plugins/goto/personal/environment/class_environment.inc @@ -313,7 +313,7 @@ class environment extends plugin $error = false; if(!isset($this->gotoKioskProfiles['SERVERS'][$this->gotoKioskProfile_Server])){ $error = true; - }elseif(!in_array($this->gotoKioskProfile_Profile, $this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server])){ + }elseif(!in_array_strict($this->gotoKioskProfile_Profile, $this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server])){ $error = true; } if($error && !empty($this->gotoKioskProfile)){ @@ -348,7 +348,7 @@ class environment extends plugin /* Log view */ if($this->is_account && !$this->view_logged){ $this->view_logged = TRUE; - if(isset($this->parent->by_object['user']) || (isset($this->attrs['objectClass']) &&in_array("gosaAccount",$this->attrs['objectClass']))){ + if(isset($this->parent->by_object['user']) || (isset($this->attrs['objectClass']) &&in_array_strict("gosaAccount",$this->attrs['objectClass']))){ new log("view","users/".get_class($this),$this->dn); }else{ new log("view","groups/".get_class($this),$this->dn); @@ -450,7 +450,7 @@ class environment extends plugin If theres is no posixAccount enabled, you won't be able to enable environment extensions */ - if((isset($this->parent->by_object['group']))||(isset($this->attrs['objectClass']))&&((in_array("posixAccount",$this->attrs['objectClass'])))){ + if((isset($this->parent->by_object['group']))||(isset($this->attrs['objectClass']))&&((in_array_strict("posixAccount",$this->attrs['objectClass'])))){ $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Desktop")), msgPool::featuresDisabled(_("Desktop"))); return $display; @@ -1027,7 +1027,7 @@ class environment extends plugin foreach(array("gotoPrinter","kiosk_server","gotoProfileFlagL","gotoXResolution", "useProfile","gotoProfileServer","gotoProfileQuota","gotoProfileFlagC") as $box){ $ubox ="use_".$box; - if(in_array($box,$this->multi_boxes)){ + if(in_array_strict($box,$this->multi_boxes)){ $smarty->assign($ubox,TRUE); }else{ $smarty->assign($ubox,FALSE); @@ -1100,7 +1100,7 @@ class environment extends plugin } if(isset($_POST['kiosk_profile'])){ $tmp = get_post('kiosk_profile'); - if(in_array($tmp,$this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server])){ + if(in_array_strict($tmp,$this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server])){ $this->gotoKioskProfile_Profile = get_post('kiosk_profile'); } } @@ -1132,7 +1132,7 @@ class environment extends plugin plugin::save_object(); foreach($this->attributes as $s_attr){ if((!isset($_POST[$s_attr])) || - in_array($s_attr,array("gosaDefaultPrinter","gotoShare","gotoHotplugDevices","gotoPrinter","gotoLogonScripts","uid"))) continue; + in_array_strict($s_attr,array("gosaDefaultPrinter","gotoShare","gotoHotplugDevices","gotoPrinter","gotoLogonScripts","uid"))) continue; if(!$this->acl_is_writeable($s_attr)){ continue; }else{ @@ -1162,7 +1162,7 @@ class environment extends plugin $this->attrs['objectClass']=array(); } if(!$this->is_group){ - if((!((in_array("posixAccount",$this->attrs['objectClass']))||($this->parent->by_object['posixAccount']->is_account==true)))&&(!$this->is_group)){ + if((!((in_array_strict("posixAccount",$this->attrs['objectClass']))||($this->parent->by_object['posixAccount']->is_account==true)))&&(!$this->is_group)){ $message[]= msgPool::featuresDisabled(_("environment"),_("POSIX")); } } @@ -1666,7 +1666,7 @@ class environment extends plugin $ret['gotoLogonScripts'] = $this->gotoLogonScripts; $ret['gotoHotplugDevices'] = $this->gotoHotplugDevices; - if(in_array("gotoPrinter",$this->multi_boxes)){ + if(in_array_strict("gotoPrinter",$this->multi_boxes)){ $ret['gotoPrinter'] = $this->gotoPrinter; $ret['gotoPrinterSel'] = $this->gotoPrinterSel; $ret['gosaDefaultPrinter'] = $this->gosaDefaultPrinter; @@ -1675,26 +1675,26 @@ class environment extends plugin $ret['add_del_printer_member_was_called'] = TRUE; } - if(in_array("gotoProfileFlagL",$this->multi_boxes)){ + if(in_array_strict("gotoProfileFlagL",$this->multi_boxes)){ $ret['gotoProfileFlagL'] = $this->gotoProfileFlagL; } - if(in_array("useProfile",$this->multi_boxes)){ + if(in_array_strict("useProfile",$this->multi_boxes)){ $ret['useProfile']=$this->useProfile; - if(in_array("gotoProfileServer",$this->multi_boxes)){ + if(in_array_strict("gotoProfileServer",$this->multi_boxes)){ $ret['gotoProfileServer']=$this->gotoProfileServer; } - if(in_array("gotoProfileQuota",$this->multi_boxes)){ + if(in_array_strict("gotoProfileQuota",$this->multi_boxes)){ $ret['gotoProfileQuota']=$this->gotoProfileQuota; } - if(in_array("gotoProfileFlagC",$this->multi_boxes)){ + if(in_array_strict("gotoProfileFlagC",$this->multi_boxes)){ $ret['gotoProfileFlagC'] = $this->gotoProfileFlagC; } } - if(in_array("gotoXResolution",$this->multi_boxes)){ + if(in_array_strict("gotoXResolution",$this->multi_boxes)){ $ret['gotoXResolution'] = $this->gotoXResolution; } - if(in_array("kiosk_server",$this->multi_boxes)){ + if(in_array_strict("kiosk_server",$this->multi_boxes)){ $ret['gotoKioskProfile_Server'] = $this->gotoKioskProfile_Server; $ret['gotoKioskProfile_Profile'] = $this->gotoKioskProfile_Profile; } @@ -1707,7 +1707,7 @@ class environment extends plugin $message = plugin::multiple_check(); $this->detect_grouptype(); - if(preg_match("/[^0-9]/",$this->gotoProfileQuota) && in_array("gotoProfileQuota",$this->multi_boxes)) { + if(preg_match("/[^0-9]/",$this->gotoProfileQuota) && in_array_strict("gotoProfileQuota",$this->multi_boxes)) { $message[] = msgPool::invalid(_("Profile quota"),$this->gotoProfileQuota,"/[0-9]/") ; } return($message); @@ -1751,7 +1751,7 @@ class environment extends plugin } if(isset($_POST['kiosk_profile'])){ $tmp = get_post('kiosk_profile'); - if(in_array($tmp,$this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server])){ + if(in_array_strict($tmp,$this->gotoKioskProfiles['BY_SERVER'][$this->gotoKioskProfile_Server])){ $this->gotoKioskProfile_Profile = get_post('kiosk_profile'); } } diff --git a/gosa-plugins/groupware/admin/ogroups/GroupwareDistributionList/class_GroupwareDistributionList.inc b/gosa-plugins/groupware/admin/ogroups/GroupwareDistributionList/class_GroupwareDistributionList.inc index 704c53f57..b9d1955f4 100644 --- a/gosa-plugins/groupware/admin/ogroups/GroupwareDistributionList/class_GroupwareDistributionList.inc +++ b/gosa-plugins/groupware/admin/ogroups/GroupwareDistributionList/class_GroupwareDistributionList.inc @@ -341,7 +341,7 @@ class GroupwareDistributionList extends plugin } return ($attrs["uid"][0]); } - if (!in_array($address, $this->alternateAddresses)){ + if (!in_array_strict($address, $this->alternateAddresses)){ $this->alternateAddresses[]= $address; $this->is_modified= TRUE; } @@ -470,14 +470,14 @@ class GroupwareDistributionList extends plugin // Check for added or removed distribution list members now. $all = array_merge($hasExt, $this->saved_attributes['memberList']); foreach($all as $member){ - if(!in_array($member,$hasExt)){ + if(!in_array_strict($member,$hasExt)){ $rpc->gwDistDelMember($this->cn, $member); if(!$rpc->success()){ $message = sprintf(_("Failed to remove member '%s' from distribution list '%s'! Error was: '%s'."), $member, $this->cn, $rpc->get_error()); msg_dialog::display(_("Error"),msgPool::rpcError($message), ERROR_DIALOG); } - }elseif(!in_array($member,$this->saved_attributes['memberList'])){ + }elseif(!in_array_strict($member,$this->saved_attributes['memberList'])){ $rpc->gwDistAddMember($this->cn, $member); if(!$rpc->success()){ $message = sprintf(_("Failed to add member '%s' to distribution list '%s'! Error was: '%s'."), diff --git a/gosa-plugins/groupware/personal/groupware/class_FilterEditor.inc b/gosa-plugins/groupware/personal/groupware/class_FilterEditor.inc index 9f39d6eff..eaa46c401 100644 --- a/gosa-plugins/groupware/personal/groupware/class_FilterEditor.inc +++ b/gosa-plugins/groupware/personal/groupware/class_FilterEditor.inc @@ -104,7 +104,7 @@ class FilterEditor extends plugin $str.= "\n"; } $str .= "\n "; - if(!in_array($cond['COMPARATOR'], array('is in addressbook','is not in addressbook','is empty','is not empty'))){ + if(!in_array_strict($cond['COMPARATOR'], array('is in addressbook','is not in addressbook','is empty','is not empty'))){ $str .= ""; } if(count($filter['CONDITIONS']) >= 2){ @@ -129,7 +129,7 @@ class FilterEditor extends plugin $str.= "\n"; } $str .= " "; - if(!in_array($action['ACTION'], array('DROP'))){ + if(!in_array_strict($action['ACTION'], array('DROP'))){ $str .= ""; } diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc index b517c3c3a..df3990351 100644 --- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc +++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc @@ -456,7 +456,7 @@ class Groupware extends plugin "","","your-address@your-domain.com"),ERROR_DIALOG); } } - } elseif ($address == $this->mailAddress || in_array($address, $this->alternateAddresses)) { + } elseif ($address == $this->mailAddress || in_array_strict($address, $this->alternateAddresses)) { msg_dialog::display(_("Error"),_("Cannot add primary address to the list of forwarders!") , ERROR_DIALOG); } else { $valid= TRUE; @@ -709,7 +709,7 @@ class Groupware extends plugin } return ($attrs["uid"][0]); } - if (!in_array($address, $this->alternateAddresses)){ + if (!in_array_strict($address, $this->alternateAddresses)){ $this->alternateAddresses[]= $address; $this->is_modified= TRUE; } diff --git a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc index 5f153e67e..43db54070 100644 --- a/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc +++ b/gosa-plugins/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc @@ -353,7 +353,7 @@ class goKrbServer extends goService{ /* Send remove policy event */ foreach($actions['del'] as $policy){ - if(!in_array($policy['NAME'],$policies)) continue; + if(!in_array_strict($policy['NAME'],$policies)) continue; if(!$o->krb5_del_policy($this->macAddress,$policy['NAME'])){ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o->get_error()),ERROR_DIALOG); } @@ -362,7 +362,7 @@ class goKrbServer extends goService{ /* Send add new/edit policy event */ foreach($actions['add_edit'] as $policy){ - if(in_array($policy['NAME'],$policies)){ + if(in_array_strict($policy['NAME'],$policies)){ if(!$o->krb5_set_policy($this->macAddress,$policy['NAME'],$policy['DATA'])){ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o->get_error()),ERROR_DIALOG); } diff --git a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc index bc21f2b6a..f5ef63436 100644 --- a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc +++ b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc @@ -305,10 +305,10 @@ class kolabAccount extends plugin $smarty->assign("multiple_support",$this->multiple_support_active); foreach($this->attributes as $attr){ - $smarty->assign("use_".$attr,in_array($attr,$this->multi_boxes)); + $smarty->assign("use_".$attr,in_array_strict($attr,$this->multi_boxes)); } foreach(array("kolabState") as $attr){ - $smarty->assign("use_".$attr,in_array($attr,$this->multi_boxes)); + $smarty->assign("use_".$attr,in_array_strict($attr,$this->multi_boxes)); } if($this->multiple_support_active){ @@ -328,7 +328,7 @@ class kolabAccount extends plugin /* Optionally execute a command after we're done */ plugin::remove_from_parent(); - if(!in_array("kolabInetOrgPerson",$this->attrs['objectClass'])){ + if(!in_array_strict("kolabInetOrgPerson",$this->attrs['objectClass'])){ $this->attrs['objectClass'][] = "kolabInetOrgPerson"; } @@ -571,7 +571,7 @@ class kolabAccount extends plugin public function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("kolabState",$this->multi_boxes)){ + if(in_array_strict("kolabState",$this->multi_boxes)){ $ret['is_account'] = $this->is_account; } return($ret); @@ -599,7 +599,7 @@ class kolabAccount extends plugin public function init_multiple_support($attrs,$all) { plugin::init_multiple_support($attrs,$all); - if(isset($attrs['objectClass']) && in_array("kolabInetOrgPerson",$attrs['objectClass'])){ + if(isset($attrs['objectClass']) && in_array_strict("kolabInetOrgPerson",$attrs['objectClass'])){ $this->is_account = TRUE; } @@ -626,14 +626,14 @@ class kolabAccount extends plugin plugin::adapt_from_template($dn, $skip); /* Setting uid to default */ - if(isset($this->attrs['uid'][0]) && !in_array("uid", $skip)){ + if(isset($this->attrs['uid'][0]) && !in_array_strict("uid", $skip)){ $this->uid = $this->attrs['uid'][0]; } /* Pull arrays */ foreach(array("kolabDelegate", "kolabInvitationPolicy") as $attr){ - if (in_array($attr, $skip)){ + if (in_array_strict($attr, $skip)){ continue; } diff --git a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc index 690c0d8ed..ec09821b9 100644 --- a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc +++ b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc @@ -261,7 +261,7 @@ class mailMethodKolab extends mailMethodCyrus if(in_array_ics("kolabDeleteflag",array_keys($this->parent->attrs))){ $reason = _("Waiting for Kolab to remove mail properties..."); return(FALSE); - }elseif(in_array("gosaMailAccount",$this->parent->attrs['objectClass'])){ + }elseif(in_array_strict("gosaMailAccount",$this->parent->attrs['objectClass'])){ $reason = _("Please remove the mail settings first!"); return(FALSE); } diff --git a/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc b/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc index 74cc95774..88597256b 100644 --- a/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc +++ b/gosa-plugins/mail/addons/mailqueue/class_mailqueue.inc @@ -93,7 +93,7 @@ class mailqueue extends plugin } /* Send action for given mail id */ - if(in_array($action,array("del","hold","unhold","requeue"))){ + if(in_array_strict($action,array("del","hold","unhold","requeue"))){ foreach($entry as $server => $entries){ $this->si_queue->send_queue_action($entries,$server,$action); } diff --git a/gosa-plugins/mail/addons/mailqueue/class_si_mailqueue.inc b/gosa-plugins/mail/addons/mailqueue/class_si_mailqueue.inc index 3eb055bde..ca4dd0c42 100644 --- a/gosa-plugins/mail/addons/mailqueue/class_si_mailqueue.inc +++ b/gosa-plugins/mail/addons/mailqueue/class_si_mailqueue.inc @@ -131,7 +131,7 @@ class si_mailqueue extends gosaSupportDaemon /* Check triggered action */ $allowed_actions = array("hold","unhold","requeue","del"); - if(!in_array($action,$allowed_actions)){ + if(!in_array_strict($action,$allowed_actions)){ trigger_error("Unknown queue action triggered '".$action."'. Request aborted."); return(FALSE); } diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc index 85df964d3..d28b9526f 100644 --- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc +++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc @@ -157,7 +157,7 @@ class mailgroup extends plugin if($this->mailMethod->domainSelectionEnabled() || $this->mailMethod->mailEqualsCN()){ $this->mailDomainPart = preg_replace("/^[^@]*+@/","",$this->mail); $this->mail = preg_replace("/@.*$/","\\1",$this->mail); - if(!in_array($this->mailDomainPart,$this->mailDomainParts)){ + if(!in_array_strict($this->mailDomainPart,$this->mailDomainParts)){ $this->mailDomainParts[] = $this->mailDomainPart; } } @@ -188,7 +188,7 @@ class mailgroup extends plugin $member = $this->get_member(); foreach($this->folder_acls as $user => $acl){ if(preg_match("/^__/",$user)) continue; - if(!in_array($user,$member['mail'])) continue; + if(!in_array_strict($user,$member['mail'])) continue; if(!isset($acl_usage[$acl])) $acl_usage[$acl]=0; $acl_usage[$acl] ++; if($acl_usage[$acl] > $most_cnt){ @@ -199,7 +199,7 @@ class mailgroup extends plugin $this->folder_acls['__member__'] = $most_acl; foreach($this->folder_acls as $name => $acl){ if(preg_match("/^__/",$name)) continue; - if($acl == $most_acl && in_array($name,$member['mail'])){ + if($acl == $most_acl && in_array_strict($name,$member['mail'])){ unset($this->folder_acls[$name]); } } @@ -246,8 +246,8 @@ class mailgroup extends plugin foreach($users as $user){ $member['all'][$user['uid'][0]] = $user['dn']; if(isset($user[$uattrib]) - && in_array("gosaMailAccount",$user['objectClass']) - && (in_array($user['uid'][0], $this->attrs['memberUid']))){ + && in_array_strict("gosaMailAccount",$user['objectClass']) + && (in_array_strict($user['uid'][0], $this->attrs['memberUid']))){ $member['mail'][$user['uid'][0]] = $user[$uattrib][0]; } } @@ -380,7 +380,7 @@ class mailgroup extends plugin } } } elseif ($address == $this->mail - || in_array($address, $this->gosaMailAlternateAddress)) { + || in_array_strict($address, $this->gosaMailAlternateAddress)) { msg_dialog::display(_("Error"),_("Cannot add primary address to the list of forwarders!") , ERROR_DIALOG); } else { $valid= TRUE; @@ -502,7 +502,7 @@ class mailgroup extends plugin Multi edit support ******/ foreach($this->attributes as $attr){ - if(in_array($attr,$this->multi_boxes)){ + if(in_array_strict($attr,$this->multi_boxes)){ $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); @@ -511,7 +511,7 @@ class mailgroup extends plugin /* Multiple support handling */ foreach(array("kolabFolderType") as $attr){ - if(in_array($attr,$this->multi_boxes)){ + if(in_array_strict($attr,$this->multi_boxes)){ $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); @@ -624,7 +624,7 @@ class mailgroup extends plugin /* Get posted mail domain part, if necessary */ if($this->mailMethod->domainSelectionEnabled() && isset($_POST['MailDomain'])){ - if(in_array(get_post('MailDomain'), $this->mailDomainParts)){ + if(in_array_strict(get_post('MailDomain'), $this->mailDomainParts)){ $this->mailDomainPart = get_post('MailDomain'); } } @@ -913,7 +913,7 @@ class mailgroup extends plugin foreach (array("gosaMailAlternateAddress", "gosaMailForwardingAddress") as $val){ - if (in_array($val, $skip)){ + if (in_array_strict($val, $skip)){ continue; } @@ -1044,7 +1044,7 @@ class mailgroup extends plugin $this->gosaMailForwardingAddress_Some = array(); if(isset($all['gosaMailForwardingAddress'])){ for($i = 0 ; $i < $all['gosaMailForwardingAddress']['count'] ; $i++){ - if(!in_array($all['gosaMailForwardingAddress'][$i],$this->gosaMailForwardingAddress)){ + if(!in_array_strict($all['gosaMailForwardingAddress'][$i],$this->gosaMailForwardingAddress)){ $this->gosaMailForwardingAddress_Some[] = $all['gosaMailForwardingAddress'][$i]; } } @@ -1096,11 +1096,11 @@ class mailgroup extends plugin $ret = plugin::get_multi_edit_values(); $ret['Forward_some'] = $this->gosaMailForwardingAddress_Some; $ret['Forward_all'] = $this->gosaMailForwardingAddress; - if(in_array('kolabFolderType',$this->multi_boxes)){ + if(in_array_strict('kolabFolderType',$this->multi_boxes)){ $ret['kolabFolderTypeType'] = $this->kolabFolderTypeType; $ret['kolabFolderTypeSubType'] = $this->kolabFolderTypeSubType; } - if(in_array("acl",$this->multi_boxes)){ + if(in_array_strict("acl",$this->multi_boxes)){ $ret['imapacl'] = $this->imapacl; } return($ret); @@ -1110,7 +1110,7 @@ class mailgroup extends plugin { $forward = array(); foreach($attrs['Forward_some'] as $addr){ - if(in_array($addr,$this->gosaMailForwardingAddress)){ + if(in_array_strict($addr,$this->gosaMailForwardingAddress)){ $forward[] = $addr; } } @@ -1183,7 +1183,7 @@ class mailgroup extends plugin } /* Add to list of alternates */ - if (!in_array($address, $this->gosaMailAlternateAddress)){ + if (!in_array_strict($address, $this->gosaMailAlternateAddress)){ $this->gosaMailAlternateAddress[]= $address; } diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc index db67e08c0..81180d6a1 100644 --- a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc +++ b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc @@ -507,7 +507,7 @@ class mailMethodCyrus extends mailMethod{ */ $script= ""; if($sieve->sieve_listscripts()){ - if (in_array("gosa", $sieve->response)){ + if (in_array_strict("gosa", $sieve->response)){ if(!$sieve->sieve_getscript("gosa")){ $this->error = sprintf(_("Cannot retrieve SIEVE script: %s"),to_string($sieve->error_raw)); @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,$sieve->error_raw , diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods.inc b/gosa-plugins/mail/personal/mail/class_mail-methods.inc index 2515d3a45..f75e0e006 100644 --- a/gosa-plugins/mail/personal/mail/class_mail-methods.inc +++ b/gosa-plugins/mail/personal/mail/class_mail-methods.inc @@ -106,7 +106,7 @@ class mailMethod{ trigger_error("mailMethod with invalid parent object initialized."); } - if(!in_array($this->type,array("user","group"))){ + if(!in_array_strict($this->type,array("user","group"))){ trigger_error("Unknown mail class type used '".$type."'."); }else{ $this->type = $type; @@ -133,7 +133,7 @@ class mailMethod{ */ if($this->config->get_cfg_value("core","mailAttribute") != ""){ $new_uattrib= strtolower($this->config->get_cfg_value("core","mailAttribute")); - if(in_array($new_uattrib,array("mail","uid"))){ + if(in_array_strict($new_uattrib,array("mail","uid"))){ $this->uattrib = $new_uattrib; }else{ @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "".$new_uattrib."", @@ -231,7 +231,7 @@ class mailMethod{ $ocs = $this->shareObjectClasses; } foreach($ocs as $oc){ - if(!in_array($oc, $this->parent->attrs['objectClass'])){ + if(!in_array_strict($oc, $this->parent->attrs['objectClass'])){ $this->parent->attrs['objectClass'][] = $oc; } } diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc index bbb0021dd..ba6b720d0 100644 --- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc +++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc @@ -187,7 +187,7 @@ class mailAccount extends plugin if($this->mailMethod->domainSelectionEnabled()){ $this->mailDomainPart = preg_replace("/^[^@]*+@/","",$this->mail); $this->mail = preg_replace("/@.*$/","\\1",$this->mail); - if(!in_array($this->mailDomainPart,$this->mailDomainParts)){ + if(!in_array_strict($this->mailDomainPart,$this->mailDomainParts)){ $this->mailDomainParts[] = $this->mailDomainPart; } } @@ -351,7 +351,7 @@ class mailAccount extends plugin } } } elseif ($address == $this->mail - || in_array($address, $this->gosaMailAlternateAddress)) { + || in_array_strict($address, $this->gosaMailAlternateAddress)) { msg_dialog::display(_("Error"),_("Cannot add primary address to the list of forwarders!") , ERROR_DIALOG); } else { $valid= TRUE; @@ -440,11 +440,11 @@ class mailAccount extends plugin /* _Multiple users vars_ */ foreach($this->attributes as $attr){ $u_attr = "use_".$attr; - $smarty->assign($u_attr,in_array($attr,$this->multi_boxes)); + $smarty->assign($u_attr,in_array_strict($attr,$this->multi_boxes)); } foreach(array("only_local","gosaMailForwardingAddress","use_mailsize_limit","drop_own_mails","use_vacation","use_spam_filter") as $attr){ $u_attr = "use_".$attr; - $smarty->assign($u_attr,in_array($attr,$this->multi_boxes)); + $smarty->assign($u_attr,in_array_strict($attr,$this->multi_boxes)); } @@ -525,7 +525,7 @@ class mailAccount extends plugin /* Get posted mail domain part, if necessary */ if($this->mailMethod->domainSelectionEnabled() && isset($_POST['MailDomain'])){ - if(in_array(get_post('MailDomain'), $this->mailDomainParts)){ + if(in_array_strict(get_post('MailDomain'), $this->mailDomainParts)){ $this->mailDomainPart = get_post('MailDomain'); } } @@ -701,7 +701,7 @@ class mailAccount extends plugin } return ($attrs["uid"][0]); } - if (!in_array($address, $this->gosaMailAlternateAddress)){ + if (!in_array_strict($address, $this->gosaMailAlternateAddress)){ $this->gosaMailAlternateAddress[]= $address; $this->is_modified= TRUE; } @@ -1119,7 +1119,7 @@ class mailAccount extends plugin foreach (array("gosaMailAlternateAddress", "gosaMailForwardingAddress") as $val){ - if (in_array($val, $skip)){ + if (in_array_strict($val, $skip)){ continue; } @@ -1156,7 +1156,7 @@ class mailAccount extends plugin if($this->is_account && $this->mailMethod->domainSelectionEnabled()){ $this->mailDomainPart = preg_replace("/^[^@]*+@/","",$this->mail); $this->mail = preg_replace("/@.*$/","\\1",$this->mail); - if(!in_array($this->mailDomainPart,$this->mailDomainParts)){ + if(!in_array_strict($this->mailDomainPart,$this->mailDomainParts)){ $this->mailDomainParts[] = $this->mailDomainPart; } } @@ -1218,7 +1218,7 @@ class mailAccount extends plugin if($this->mailMethod->domainSelectionEnabled()){ $this->mailDomainPart = preg_replace("/^[^@]*+@/","",$this->mail); $this->mail = preg_replace("/@.*$/","\\1",$this->mail); - if(!in_array($this->mailDomainPart,$this->mailDomainParts)){ + if(!in_array_strict($this->mailDomainPart,$this->mailDomainParts)){ $this->mailDomainParts[] = $this->mailDomainPart; } } @@ -1238,7 +1238,7 @@ class mailAccount extends plugin function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("gosaMailQuota",$this->multi_boxes)){ + if(in_array_strict("gosaMailQuota",$this->multi_boxes)){ $ret['gosaMailQuota'] = $this->gosaMailQuota; } $flag_add = $flag_remove = array(); @@ -1251,7 +1251,7 @@ class mailAccount extends plugin "C" => "own_script", "I" => "drop_own_mails"); foreach($opts as $flag => $post){ - if(in_array($post, $this->multi_boxes)){ + if(in_array_strict($post, $this->multi_boxes)){ if(preg_match("/".$flag."/",$tmp)){ $flag_add[] = $flag; }else{ @@ -1263,7 +1263,7 @@ class mailAccount extends plugin $ret['flag_remove'] = $flag_remove; if($this->mailMethod->vacationRangeEnabled()){ - if(in_array("V",$flag_add)){ + if(in_array_strict("V",$flag_add)){ $ret['gosaVacationStart'] = $this->gosaVacationStart = get_post('gosaVacationStart'); $ret['gosaVacationStop'] = $this->gosaVacationStop = get_post('gosaVacationStop'); } @@ -1278,12 +1278,12 @@ class mailAccount extends plugin { $message = plugin::multiple_check(); - if(empty($this->gosaMailServer) && in_array("gosaMailServer",$this->multi_boxes)){ + if(empty($this->gosaMailServer) && in_array_strict("gosaMailServer",$this->multi_boxes)){ $message[]= msgPool::noserver(_("Mail")); } /* Check quota */ - if ($this->gosaMailQuota != '' && in_array("gosaMailQuota",$this->multi_boxes)){ + if ($this->gosaMailQuota != '' && in_array_strict("gosaMailQuota",$this->multi_boxes)){ if (!is_numeric($this->gosaMailQuota)) { $message[]= msgPool::invalid(_("Quota size"),$this->gosaMailQuota,"/^[0-9]*/"); } else { @@ -1292,7 +1292,7 @@ class mailAccount extends plugin } /* Check rejectsize for integer */ - if ($this->gosaMailMaxSize != '' && in_array("gosaMailMaxSize",$this->multi_boxes)){ + if ($this->gosaMailMaxSize != '' && in_array_strict("gosaMailMaxSize",$this->multi_boxes)){ if (!is_numeric($this->gosaMailMaxSize)){ $message[]= msgPool::invalid(_("Mail reject size"),$this->gosaMailMaxSize,"/^[0-9]*/"); } else { @@ -1300,7 +1300,7 @@ class mailAccount extends plugin } } - if(empty($this->gosaSpamMailbox) && in_array("gosaSpamMailbox",$this->multi_boxes)){ + if(empty($this->gosaSpamMailbox) && in_array_strict("gosaSpamMailbox",$this->multi_boxes)){ $message[]= msgPool::required(_("Spam folder")); } diff --git a/gosa-plugins/mail/personal/mail/sieve/class_My_Tree.inc b/gosa-plugins/mail/personal/mail/sieve/class_My_Tree.inc index 0f18cecc7..82f152206 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_My_Tree.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_My_Tree.inc @@ -66,7 +66,7 @@ class My_Tree extends Tree $end = $this->get_block_end($key,false); $end2 = $this->get_block_end($key); - if($end != $key && in_array(get_class($object),array("sieve_if"))){ + if($end != $key && in_array_strict(get_class($object),array("sieve_if"))){ $ends_complete_block[$end2] = $end2; $this->dump_ .= "
"; $this->dump_ .= "
"; @@ -75,7 +75,7 @@ class My_Tree extends Tree $this->dump_ .= $block_indent_stop; } $this->dump_ .= preg_replace("/>/",">\n",$object->execute()); - if($end != $key && in_array(get_class($object),array("sieve_if","sieve_else","sieve_elsif"))) { + if($end != $key && in_array_strict(get_class($object),array("sieve_if","sieve_else","sieve_elsif"))) { $ends[$end] = $end; $this->dump_ .= $block_indent_start; } @@ -164,7 +164,7 @@ class My_Tree extends Tree /* Handle identifiers */ $identifiers = array("else","if","elsif","end","reject","redirect","vacation","keep","discard","fileinto","require","stop"); - if($node['class'] == "identifier" && in_array($node['text'],$identifiers)){ + if($node['class'] == "identifier" && in_array_strict($node['text'],$identifiers)){ $this->mode_stack[] = array("TYPE" => $node['text']); } @@ -220,7 +220,7 @@ class My_Tree extends Tree reset($this->pap); foreach($this->pap as $key => $obj){ - if(in_array(get_class($obj),array("sieve_if", + if(in_array_strict(get_class($obj),array("sieve_if", "sieve_elsif", "sieve_vacation", "sieve_comment", @@ -252,7 +252,7 @@ class My_Tree extends Tree } $class = get_class($this->pap[$key_id]); - if(in_array($class,array("sieve_if","sieve_elsif","sieve_else"))){ + if(in_array_strict($class,array("sieve_if","sieve_elsif","sieve_else"))){ $block_start= $key_id; $block_end = $this->get_block_end($key_id); @@ -283,7 +283,7 @@ class My_Tree extends Tree /* Get the current element to decide what to move. */ $e_class = get_class($this->pap[$key_id]); - if(in_array($e_class,array("sieve_if"))){ + if(in_array_strict($e_class,array("sieve_if"))){ $block_start= $key_id; $block_end = $this->get_block_end($key_id); @@ -298,7 +298,7 @@ class My_Tree extends Tree $this->move_multiple_elements($block_start,$block_end,$next_free); } - if(in_array($e_class,array( "sieve_stop", + if(in_array_strict($e_class,array( "sieve_stop", "sieve_keep", "sieve_require", "sieve_comment", @@ -393,7 +393,7 @@ class My_Tree extends Tree /* Only execute if this is a really a block element. * Block elements is only sieve_if */ - if(in_array(get_class($this->pap[$start]),array("sieve_if","sieve_elsif","sieve_else"))){ + if(in_array_strict(get_class($this->pap[$start]),array("sieve_if","sieve_elsif","sieve_else"))){ $class = get_class($this->pap[$start]); $next_class = get_class($this->pap[$start+1]); @@ -414,7 +414,7 @@ class My_Tree extends Tree if($complete){ if( $block_depth == 0 && $class == "sieve_block_end" && - !in_array($next_class,array("sieve_else","sieve_elsif"))){ + !in_array_strict($next_class,array("sieve_else","sieve_elsif"))){ $end = TRUE; $start --; } @@ -564,7 +564,7 @@ class My_Tree extends Tree } $include_self = FALSE; $current_class = get_class($test[$key_id]); - if(in_array($current_class, $allowed_to_add_after)){ + if(in_array_strict($current_class, $allowed_to_add_after)){ return($key_id); } } @@ -579,7 +579,7 @@ class My_Tree extends Tree } while($key_id >=0 ){ $current_class = get_class($test[$key_id]); - if(in_array($current_class, $allowed_to_add_before)){ + if(in_array_strict($current_class, $allowed_to_add_before)){ return($key_id); } $key_id --; @@ -650,7 +650,7 @@ class My_Tree extends Tree } foreach($this->pap as $key => $obj){ if($key == $last_found_at) break; - if(!in_array(get_class($obj),array("sieve_comment","sieve_require"))){ + if(!in_array_strict(get_class($obj),array("sieve_comment","sieve_require"))){ $objs[] = get_class($obj); } } diff --git a/gosa-plugins/mail/personal/mail/sieve/class_parser.inc b/gosa-plugins/mail/personal/mail/sieve/class_parser.inc index 5326c2b37..94a48ff1f 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_parser.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_parser.inc @@ -62,7 +62,7 @@ class Parser { $prev = $this->tree_->getNode($childs[$i-1]); - if (in_array($prev['text'], array('{', '(', ','))) + if (in_array_strict($prev['text'], array('{', '(', ','))) { // use command owning a block or list $prev = $this->tree_->getNode($parent_id); @@ -92,7 +92,7 @@ class Parser function isExtensionRegistered_($extension) { - return (in_array($extension, $this->registeredExtensions_) ? true : false); + return (in_array_strict($extension, $this->registeredExtensions_) ? true : false); } function success_($text = null) diff --git a/gosa-plugins/mail/personal/mail/sieve/class_scanner.inc b/gosa-plugins/mail/personal/mail/sieve/class_scanner.inc index 3e22bb1d0..b00ffd1c5 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_scanner.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_scanner.inc @@ -77,7 +77,7 @@ class Scanner if (is_array($class)) { - return in_array($next, $class); + return in_array_strict($next, $class); } else if (is_string($class)) { diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc index d929e3fbe..4412f3fe6 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc @@ -236,7 +236,7 @@ class sieve_if $script .= $data['Match_type']." "; /* Add special match type for count and value */ - if(in_array($data['Match_type'], array(":value",":count")) && !empty($data['Match_type_value'])) { + if(in_array_strict($data['Match_type'], array(":value",":count")) && !empty($data['Match_type_value'])) { $script .= sieve_create_strings($data['Match_type_value'])." "; } @@ -281,7 +281,7 @@ class sieve_if $script .= $data['Match_type']." "; /* Add special match type for count and value */ - if(in_array($data['Match_type'], array(":value",":count")) && !empty($data['Match_type_value'])) { + if(in_array_strict($data['Match_type'], array(":value",":count")) && !empty($data['Match_type_value'])) { $script .= sieve_create_strings($data['Match_type_value'])." "; } @@ -327,7 +327,7 @@ class sieve_if $script .= $data['Match_type']." "; /* Add special match type for count and value */ - if(in_array($data['Match_type'], array(":value",":count")) && !empty($data['Match_type_value'])) { + if(in_array_strict($data['Match_type'], array(":value",":count")) && !empty($data['Match_type_value'])) { $script .= sieve_create_strings($data['Match_type_value'])." "; } @@ -630,7 +630,7 @@ class sieve_if /* In case of :count and :value match types * we have a special match operator we should save. */ - if(in_array($parsed[$key]['Match_type'],array(":value",":count"))){ + if(in_array_strict($parsed[$key]['Match_type'],array(":value",":count"))){ if(isset($_POST['operator_'.$element_id])){ $op = $_POST['operator_'.$element_id]; @@ -1266,7 +1266,7 @@ class sieve_if $Match_type = $node['text']; /* Get value operator */ - if(in_array($Match_type,array(":value",":count"))){ + if(in_array_strict($Match_type,array(":value",":count"))){ $i ++; $node = $data[$i]; @@ -1380,7 +1380,7 @@ class sieve_if /* Skip first values, [if,not,exists] */ $node = $data[$id]; - while(in_array($node['text'],array("if","not","exists"))){ + while(in_array_strict($node['text'],array("if","not","exists"))){ $id ++; $node = $data[$id]; } @@ -1448,16 +1448,16 @@ class sieve_if $next = NULL; $num = 0; for($i = $id ; $i < count($data) ; $i++ ){ - if(in_array($data[$i]['class'],array("left-parant","left-bracket"))){ + if(in_array_strict($data[$i]['class'],array("left-parant","left-bracket"))){ $open_brakets ++; } if($data[$i]['class'] == "comma" && $open_brakets == 1){ $num ++; } - if(!in_array($data[$i]['class'],array("comma","left-parant","right-parant")) || $open_brakets >1 ){ + if(!in_array_strict($data[$i]['class'],array("comma","left-parant","right-parant")) || $open_brakets >1 ){ $par[$num][] = $data[$i]; } - if(in_array($data[$i]['class'],array("right-parant","right-bracket"))){ + if(in_array_strict($data[$i]['class'],array("right-parant","right-bracket"))){ $open_brakets --; } } diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Require.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Require.inc index bd8fe9ae9..cbec547c7 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Require.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Require.inc @@ -33,7 +33,7 @@ class sieve_require foreach($this->data as $dat){ $current[] = $dat; } - if(!in_array($str,$current)){ + if(!in_array_strict($str,$current)){ $this->data[] = $str; } $this->data = array_unique($this->data); diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Vacation.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Vacation.inc index a8ba251c6..efb51934d 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Vacation.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_Vacation.inc @@ -37,7 +37,7 @@ class sieve_vacation $node = $data['ELEMENTS'][$i]; /* Check if tag is in the specified list of attributes */ - if($node['class'] == "tag" && in_array($node['text'],$known_attrs)){ + if($node['class'] == "tag" && in_array_strict($node['text'],$known_attrs)){ $var = preg_replace("/\:/","",$node['text']); $this->$var = $data['ELEMENTS'][$i+1]['text']; @@ -63,7 +63,7 @@ class sieve_vacation } /* Add the vacation message */ - if(in_array($node['class'],array("quoted-string","multi-line"))){ + if(in_array_strict($node['class'],array("quoted-string","multi-line"))){ $tmp = sieve_get_strings($data['ELEMENTS'],$i); $strs= $tmp['STRINGS']; diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc index 0fea77860..b5082aad9 100644 --- a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc +++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc @@ -524,7 +524,7 @@ class sieveManagement extends plugin /* Element selected */ if(isset($_POST['element_type']) && isset($element_types[$_POST['element_type']]) - || isset($_POST['element_type']) &&in_array($_POST['element_type'],array("sieve_else","sieve_elsif"))){ + || isset($_POST['element_type']) &&in_array_strict($_POST['element_type'],array("sieve_else","sieve_elsif"))){ $this->add_element_type = $_POST['element_type']; } @@ -555,7 +555,7 @@ class sieveManagement extends plugin */ foreach($this->current_handler->tree_->pap as $key => $obj){ - if($obj->object_id == $this->add_new_id && in_array(get_class($obj),array("sieve_if","sieve_elsif"))){ + if($obj->object_id == $this->add_new_id && in_array_strict(get_class($obj),array("sieve_if","sieve_elsif"))){ /* Get block start/end */ $end_id = $this->current_handler->tree_->get_block_end($key); @@ -729,7 +729,7 @@ class sieveManagement extends plugin */ foreach($this->current_handler->tree_->pap as $key => $obj){ - if($obj->object_id == $id && in_array(get_class($obj),array("sieve_if","sieve_elsif"))){ + if($obj->object_id == $id && in_array_strict(get_class($obj),array("sieve_if","sieve_elsif"))){ /* Get block start/end */ $end_id = $this->current_handler->tree_->get_block_end($key); @@ -760,7 +760,7 @@ class sieveManagement extends plugin }else{ /* Allow adding elsif above elsif */ - if(in_array(get_class($obj),array("sieve_elsif"))){ + if(in_array_strict(get_class($obj),array("sieve_elsif"))){ $element_types['sieve_elsif'] = _("Else If"); } } @@ -960,7 +960,7 @@ class sieveManagement extends plugin $this->current_handler->save_object(); $Mode = $this->scripts[$this->current_script]['MODE']; $skip_mode_change = false; - if(in_array($Mode,array("Source-Only","Source"))){ + if(in_array_strict($Mode,array("Source-Only","Source"))){ if(isset($_POST['script_contents'])){ $sc = stripslashes($_POST['script_contents']); $this->scripts[$this->current_script]['SCRIPT'] = $sc; @@ -973,7 +973,7 @@ class sieveManagement extends plugin } } } - if(in_array($Mode,array("Structured"))){ + if(in_array_strict($Mode,array("Structured"))){ $sc = $this->current_handler->get_sieve_script(); $this->scripts[$this->current_script]['SCRIPT'] = $sc; $p = new My_Parser($this); diff --git a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc index 1947a40f4..75e9cd46a 100644 --- a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc +++ b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc @@ -351,7 +351,7 @@ class goKrbServer extends goService{ /* Send remove policy event */ foreach($actions['del'] as $policy){ - if(!in_array($policy['NAME'],$policies)) continue; + if(!in_array_strict($policy['NAME'],$policies)) continue; if(!$o->krb5_del_policy($this->macAddress,$policy['NAME'])){ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o->get_error()),ERROR_DIALOG); } @@ -360,7 +360,7 @@ class goKrbServer extends goService{ /* Send add new/edit policy event */ foreach($actions['add_edit'] as $policy){ - if(in_array($policy['NAME'],$policies)){ + if(in_array_strict($policy['NAME'],$policies)){ if(!$o->krb5_set_policy($this->macAddress,$policy['NAME'],$policy['DATA'])){ msg_dialog::display(_("Service infrastructure"),msgPool::siError($o->get_error()),ERROR_DIALOG); } diff --git a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb5_policy.inc b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb5_policy.inc index ef0f7de23..89c07fe40 100644 --- a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb5_policy.inc +++ b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_krb5_policy.inc @@ -105,7 +105,7 @@ class krb5_policy extends plugin { $message = array(); $names = $this->parent->getPolicyNames(); - if($this->name != $this->init_name && in_array($this->name,$names)){ + if($this->name != $this->init_name && in_array_strict($this->name,$names)){ $message[] = msgPool::duplicated(_("Policy name")); } if(empty($this->name)){ diff --git a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc index 6be7db304..5165d4349 100644 --- a/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc +++ b/gosa-plugins/mit-krb5/admin/systems/services/kerberos/class_password-methods-MIT.inc @@ -675,7 +675,7 @@ class passwordMethodMIT extends passwordMethod /* Save principal changes */ $o = new gosaSupportDaemon(); - if(in_array($principal,$this->server_list[$server_name]['principals'])){ + if(in_array_strict($principal,$this->server_list[$server_name]['principals'])){ $this->is_new = FALSE; } diff --git a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc index 9c0b747eb..909a50676 100644 --- a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc +++ b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc @@ -127,7 +127,7 @@ class nagiosAccount extends plugin /* Assign attributes an ACL to smarty */ foreach($this->attributes as $val) { $smarty->assign("$val", set_post($this->$val)); - if(in_array($val,$this->is_chk_box)){ + if(in_array_strict($val,$this->is_chk_box)){ if($this->$val == "checked"){ $smarty->assign($val."CHK", " checked "); }else{ diff --git a/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengw.inc b/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengw.inc index de50ef936..ffc41db65 100644 --- a/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengw.inc +++ b/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengw.inc @@ -93,7 +93,7 @@ class ogw{ function Perform($option) { - if(!in_array($option,array("ADD","EDIT","REMOVE"))){ + if(!in_array_strict($option,array("ADD","EDIT","REMOVE"))){ $this->LastError = sprintf("Option '%s' is not allowed, possible options are 'ADD' 'EDIT' 'REMOVE'.",$option); return(false); }else{ @@ -203,7 +203,7 @@ class ogw{ foreach($this->validLocationTeam as $id){ $tmp[]= $id['company_id']; } - if(!in_array($this->info['LocationTeamID'],$tmp)){ + if(!in_array_strict($this->info['LocationTeamID'],$tmp)){ $this->LastError = "Given 'Location Team' is invalid."; return(false); } @@ -212,7 +212,7 @@ class ogw{ foreach($this->validTemplateUser as $id){ $tmp[]= $id['company_id']; } - if(!in_array($this->info['template_user_id'],$tmp)){ + if(!in_array_strict($this->info['template_user_id'],$tmp)){ $this->LastError = "Given 'Template User ID' is invalid."; return(false); } @@ -224,7 +224,7 @@ class ogw{ } if(is_array($this->info['TeamIDis'])){ foreach($this->info['TeamIDis'] as $id){ - if(!in_array($id,$tmp)){ + if(!in_array_strict($id,$tmp)){ $this->LastError = sprintf("Given 'Team ID':%s is invalid.",$id); return(false); } diff --git a/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc b/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc index 3fe61bed8..b52e7bd4d 100644 --- a/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc +++ b/gosa-plugins/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc @@ -211,7 +211,7 @@ class opengwAccount extends plugin if($this->acl_is_readable("Teams")){ foreach($this->handle->validTeams as $id){ - if(in_array($id['company_id'],$this->info['TeamIDis'])){ + if(in_array_strict($id['company_id'],$this->info['TeamIDis'])){ $str .= "".$id['description']."
"; }else{ @@ -270,7 +270,7 @@ class opengwAccount extends plugin if($this->acl_is_writeable("Teams")) { foreach($_POST as $name => $value ){ if(preg_match("/team_/i",$name)){ - if(!in_array($value,$this->info['TeamIDis'])){ + if(!in_array_strict($value,$this->info['TeamIDis'])){ $this->info['TeamIDis'][]=$value; } } diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc index 7d815d40f..22324e41e 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc @@ -185,8 +185,8 @@ class licenseGeneric extends plugin if(isset($_POST['addLicenseUsage']) && isset($_POST['selectedHostToAdd'])){ $host = get_post('selectedHostToAdd'); if(!empty($host) && - in_array($host,$this->getHosts()) && - !in_array($host, $this->usedByHost)){ + in_array_strict($host,$this->getHosts()) && + !in_array_strict($host, $this->usedByHost)){ $this->usedByHost[] = $host; } } diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licensePoolGeneric.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licensePoolGeneric.inc index dddcd36f8..b80de75b0 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_licensePoolGeneric.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licensePoolGeneric.inc @@ -343,7 +343,7 @@ class licensePoolGeneric extends plugin if(preg_match("/w/",$this->getacl("productIds"))){ if(isset($_POST['availableProduct']) && isset($_POST['addProduct'])){ $pro = get_post('availableProduct'); - if(isset($this->availableProductIds[$pro]) && !in_array($this->availableProductIds[$pro], $this->productIds)){ + if(isset($this->availableProductIds[$pro]) && !in_array_strict($this->availableProductIds[$pro], $this->productIds)){ $this->productIds[] =$this->availableProductIds[$pro]; } } @@ -364,7 +364,7 @@ class licensePoolGeneric extends plugin if(preg_match("/w/",$this->getacl("windowsSoftwareIds"))){ if(isset($_POST['newSoftwareId']) && isset($_POST['addSoftware'])){ $soft = trim(get_post('newSoftwareId')); - if(!empty($soft) && !in_array($soft, $this->softwareIds)){ + if(!empty($soft) && !in_array_strict($soft, $this->softwareIds)){ $this->softwareIds[] = $soft; } } diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc index 471715c7d..e9d807549 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc @@ -176,7 +176,7 @@ class licenseUsageByHost extends plugin // build up a available licenses list. $licenses = array(); foreach($this->availableLicenses as $key => $license){ - if(!in_array($license['softwareLicenseId'][0], $this->reservedLicenses)){ + if(!in_array_strict($license['softwareLicenseId'][0], $this->reservedLicenses)){ $licenses[$key] = $license['softwareLicenseId'][0]." [".$license['licensePoolId'][0]."]"; } } @@ -211,7 +211,7 @@ class licenseUsageByHost extends plugin // Check if we've to add reservations if(isset($_POST['availableLicense']) && isset($_POST['addReservation'])){ $id = get_post('availableLicense'); - if(isset($this->availableLicenses[$id]) && !in_array($this->availableLicenses[$id],$this->reservedLicenses)){ + if(isset($this->availableLicenses[$id]) && !in_array_strict($this->availableLicenses[$id],$this->reservedLicenses)){ $this->reservedLicenses[$id] = $this->availableLicenses[$id]['softwareLicenseId'][0]; } } diff --git a/gosa-plugins/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc b/gosa-plugins/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc index 306d116bb..9b050c3b8 100644 --- a/gosa-plugins/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc +++ b/gosa-plugins/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc @@ -59,7 +59,7 @@ class phpgwAccount extends plugin $smarty->assign('phpgwAccountACL', $this->getacl("",$this->ReadOnly)); $smarty->assign("multiple_support",$this->multiple_support_active); - $smarty->assign("use_phpgw",in_array("phpgw",$this->multi_boxes)); + $smarty->assign("use_phpgw",in_array_strict("phpgw",$this->multi_boxes)); $display.= $smarty->fetch (get_template_path('phpgw.tpl', TRUE, dirname(__FILE__))); return ($display); } @@ -203,7 +203,7 @@ class phpgwAccount extends plugin function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("phpgw",$this->multi_boxes)){ + if(in_array_strict("phpgw",$this->multi_boxes)){ $ret['is_account'] = $this->is_account; } return($ret); @@ -220,7 +220,7 @@ class phpgwAccount extends plugin function init_multiple_support($attrs,$all) { plugin::init_multiple_support($attrs,$all); - if(isset($attrs['objectClass']) && in_array("phpgwAccount",$attrs['objectClass'])){ + if(isset($attrs['objectClass']) && in_array_strict("phpgwAccount",$attrs['objectClass'])){ $this->is_account = TRUE; } } diff --git a/gosa-plugins/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc b/gosa-plugins/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc index 5bc499379..b934fb337 100644 --- a/gosa-plugins/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc +++ b/gosa-plugins/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc @@ -103,13 +103,13 @@ class pureftpdAccount extends plugin } foreach($this->attributes as $attr){ - if(in_array($attr,$this->multi_boxes)){ + if(in_array_strict($attr,$this->multi_boxes)){ $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); } } - $smarty->assign("use_pureftpd",in_array("pureftpd",$this->multi_boxes)); + $smarty->assign("use_pureftpd",in_array_strict("pureftpd",$this->multi_boxes)); $smarty->assign("multiple_support",$this->multiple_support_active); $smarty->assign("FTPStatus", ($this->FTPStatus == "disabled") ? "checked" : ""); $smarty->assign('pureftpdACL', $this->getacl("",$this->ReadOnly)); @@ -307,7 +307,7 @@ class pureftpdAccount extends plugin function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("pureftpd",$this->multi_boxes)){ + if(in_array_strict("pureftpd",$this->multi_boxes)){ $ret['is_account'] = $this->is_account; } return($ret); diff --git a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc index 61959caa7..7c878da80 100644 --- a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc +++ b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc @@ -339,14 +339,14 @@ class rsyslog extends plugin // Get Host if( isset($this->servers[$this->selected_server]['Hosts']) && isset($_POST['selected_host']) && ($_POST['selected_host'] == "all" || - in_array($_POST['selected_host'],$this->servers[$this->selected_server]['Hosts']))){ + in_array_strict($_POST['selected_host'],$this->servers[$this->selected_server]['Hosts']))){ $this->selected_host = get_post('selected_host'); } // Get priority from post if( isset($this->servers[$this->selected_server]['Priorities']) && isset($_POST['selected_priority']) && ($_POST['selected_priority'] == "all" || - in_array($_POST['selected_priority'],$this->servers[$this->selected_server]['Priorities']))){ + in_array_strict($_POST['selected_priority'],$this->servers[$this->selected_server]['Priorities']))){ $this->selected_priority = get_post('selected_priority'); } @@ -362,7 +362,7 @@ class rsyslog extends plugin } // Get sorting attributes - if(isset($_GET['sort_value']) && in_array($_GET['sort_value'], + if(isset($_GET['sort_value']) && in_array_strict($_GET['sort_value'], array("DeviceReportedTime","FromHost","Facility","Priority","Message","SysLogTag"))){ $sort_value = $_GET['sort_value']; if($this->sort_value == $sort_value){ diff --git a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc index 2a5096c02..497f6e4f3 100644 --- a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc +++ b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc @@ -28,7 +28,7 @@ class rSyslogServer extends goService{ goService::goService($config,$dn); $this->DisplayName = _("Logging"); $this->initial_use_database = $this->use_database = - isset($this->attrs['objectClass']) &&in_array("goLogDBServer", $this->attrs['objectClass']); + isset($this->attrs['objectClass']) &&in_array_strict("goLogDBServer", $this->attrs['objectClass']); if($this->use_database){ foreach($this->db_attributes as $attr){ diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc index 6549bbdbb..1466f0a88 100644 --- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc +++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc @@ -398,7 +398,7 @@ class sambaAccount extends plugin $smarty->assign("$attr", set_post($this->mungedObject->ctx[$attr])); // Set field to blank if value is 0 - if(in_array($attr, array("CtxMaxConnectionTime", "CtxMaxDisconnectionTime", "CtxMaxIdleTime"))) { + if(in_array_strict($attr, array("CtxMaxConnectionTime", "CtxMaxDisconnectionTime", "CtxMaxIdleTime"))) { if($this->mungedObject->ctx[$attr] == 0) { $smarty->assign("$attr", ""); } @@ -478,7 +478,7 @@ class sambaAccount extends plugin // Assign selected multi edit checkbox values. foreach($this->attributes as $attr){ - if(in_array($attr,$this->multi_boxes)){ + if(in_array_strict($attr,$this->multi_boxes)){ $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); @@ -494,7 +494,7 @@ class sambaAccount extends plugin "enforcePasswordChange", "passwordNeverExpires", "noPasswordRequired", "temporaryDisabled","cannotChangePassword") as $attr){ - if(in_array($attr,$this->multi_boxes)){ + if(in_array_strict($attr,$this->multi_boxes)){ $smarty->assign("use_".$attr,TRUE); }else{ $smarty->assign("use_".$attr,FALSE); @@ -1146,7 +1146,7 @@ class sambaAccount extends plugin $this->sambaPrimaryGroupSID= ""; /* Fill mungedDial field */ - if (isset($this->attrs['sambaMungedDial']) && !in_array('sambaMungedDial', $skip)){ + if (isset($this->attrs['sambaMungedDial']) && !in_array_strict('sambaMungedDial', $skip)){ $this->mungedObject->load($this->sambaMungedDial); } @@ -1237,7 +1237,7 @@ class sambaAccount extends plugin /* Strings */ foreach (array( "sambaHomePath" => _("Home directory"), "sambaProfilePath" => _("Profile path")) as $key => $val){ - if (in_array($key,$this->multi_boxes) && !$this->mungedObject->is_samba_path($this->$key)){ + if (in_array_strict($key,$this->multi_boxes) && !$this->mungedObject->is_samba_path($this->$key)){ $message[]= msgPool::invalid($val); } } @@ -1246,7 +1246,7 @@ class sambaAccount extends plugin foreach (array( "CtxMaxConnectionTime" => _("Connection"), "CtxMaxDisconnectionTime" => _("Disconnection"), "CtxMaxIdleTime" => _("IDLE")) as $key => $val){ - if (in_array($key,$this->multi_boxes) && + if (in_array_strict($key,$this->multi_boxes) && isset($this->mungedObject->ctx[$key]) && !tests::is_id($this->mungedObject->ctx[$key]) && $val != 0){ $message[]=msgPool::invalid($val); @@ -1259,7 +1259,7 @@ class sambaAccount extends plugin } - if(in_array("sambaKickoffTime", $this->multi_boxes) && $this->flag_sambaKickoffTime){ + if(in_array_strict("sambaKickoffTime", $this->multi_boxes) && $this->flag_sambaKickoffTime){ if(!preg_match("/^[0-3][0-9]\.[0-1][0-9]\.([0-9]){4}$/",$this->sambaKickoffTime)){ $message[] = msgPool::invalid(_("Account expires after")); }elseif(!strtotime($this->sambaKickoffTime) || strtotime($this->sambaKickoffTime) >= 2147483647){ @@ -1328,43 +1328,43 @@ class sambaAccount extends plugin $ret = plugin::get_multi_edit_values(); /* Terminal Server */ - if(in_array("tslogin",$this->multi_boxes)){ + if(in_array_strict("tslogin",$this->multi_boxes)){ $ret['tslogin'] = $this->mungedObject->getTsLogin(); } - if(in_array("CtxWFHomeDirDrive",$this->multi_boxes)){ + if(in_array_strict("CtxWFHomeDirDrive",$this->multi_boxes)){ $ret['CtxWFHomeDirDrive'] = $this->mungedObject->ctx['CtxWFHomeDirDrive']; } - if(in_array("CtxWFHomeDir",$this->multi_boxes)){ + if(in_array_strict("CtxWFHomeDir",$this->multi_boxes)){ $ret['CtxWFHomeDir'] = $this->mungedObject->ctx['CtxWFHomeDir']; } - if(in_array("CtxWFProfilePath",$this->multi_boxes)){ + if(in_array_strict("CtxWFProfilePath",$this->multi_boxes)){ $ret['CtxWFProfilePath'] = $this->mungedObject->ctx['CtxWFProfilePath']; } - if(in_array("inherit",$this->multi_boxes)){ + if(in_array_strict("inherit",$this->multi_boxes)){ $ret['inherit'] = $this->mungedObject->getInheritMode(); } - if(in_array("CtxInitialProgram",$this->multi_boxes)){ + if(in_array_strict("CtxInitialProgram",$this->multi_boxes)){ $ret['CtxInitialProgram'] = $this->mungedObject->ctx['CtxInitialProgram']; } - if(in_array("CtxWorkDirectory",$this->multi_boxes)){ + if(in_array_strict("CtxWorkDirectory",$this->multi_boxes)){ $ret['CtxWorkDirectory'] = $this->mungedObject->ctx['CtxWorkDirectory']; } /* Time Limits. Be careful here, there are some negations */ - if(in_array("CtxMaxConnectionTimeF",$this->multi_boxes)){ + if(in_array_strict("CtxMaxConnectionTimeF",$this->multi_boxes)){ $ret["CtxMaxConnectionTimeF"] = !$this->mungedObject->getCtxMaxConnectionTimeF(); if(!$ret["CtxMaxConnectionTimeF"]){ $ret["CtxMaxConnectionTime"] = $this->mungedObject->ctx['CtxMaxConnectionTime']; } } - if(in_array("CtxMaxDisconnectionTimeF",$this->multi_boxes)){ + if(in_array_strict("CtxMaxDisconnectionTimeF",$this->multi_boxes)){ $ret["CtxMaxDisconnectionTimeF"]= !$this->mungedObject->getCtxMaxDisconnectionTimeF(); if(!$ret["CtxMaxDisconnectionTimeF"]){ $ret["CtxMaxDisconnectionTime"]= $this->mungedObject->ctx['CtxMaxDisconnectionTime']; } } - if(in_array("CtxMaxIdleTimeF",$this->multi_boxes)){ + if(in_array_strict("CtxMaxIdleTimeF",$this->multi_boxes)){ $ret["CtxMaxIdleTimeF"] = !$this->mungedObject->getCtxMaxIdleTimeF(); if(!$ret["CtxMaxIdleTimeF"]){ $ret["CtxMaxIdleTime"] = $this->mungedObject->ctx['CtxMaxIdleTime']; @@ -1372,24 +1372,24 @@ class sambaAccount extends plugin } /* Client Devices */ - if(in_array("connectclientdrives",$this->multi_boxes)){ + if(in_array_strict("connectclientdrives",$this->multi_boxes)){ $ret["connectclientdrives"] = $this->mungedObject->getConnectClientDrives(); } - if(in_array("connectclientprinters",$this->multi_boxes)){ + if(in_array_strict("connectclientprinters",$this->multi_boxes)){ $ret["connectclientprinters"] = $this->mungedObject->getConnectClientPrinters(); } - if(in_array("defaultprinter",$this->multi_boxes)){ + if(in_array_strict("defaultprinter",$this->multi_boxes)){ $ret["defaultprinter"] = $this->mungedObject->getDefaultPrinter(); } /* Misc */ - if(in_array("shadow",$this->multi_boxes)){ + if(in_array_strict("shadow",$this->multi_boxes)){ $ret["shadow"] =$this->mungedObject->getShadow(); } - if(in_array("brokenconn",$this->multi_boxes)){ + if(in_array_strict("brokenconn",$this->multi_boxes)){ $ret["brokenconn"]=$this->mungedObject->getBrokenConn(); } - if(in_array("reconn",$this->multi_boxes)){ + if(in_array_strict("reconn",$this->multi_boxes)){ $ret["reconn"] =$this->mungedObject->getReConn(); } @@ -1399,11 +1399,11 @@ class sambaAccount extends plugin $ret[$attr] = $this->$attr; } - if(in_array("SetSambaLogonHours",$this->multi_boxes)){ + if(in_array_strict("SetSambaLogonHours",$this->multi_boxes)){ $ret['sambaLogonHours'] = $this->sambaLogonHours; } - if(in_array("workstation_list",$this->multi_boxes)){ + if(in_array_strict("workstation_list",$this->multi_boxes)){ $ret['multiple_sambaUserWorkstations'] = $this->multiple_sambaUserWorkstations; } diff --git a/gosa-plugins/samba/personal/samba/class_sambaMungedDial.inc b/gosa-plugins/samba/personal/samba/class_sambaMungedDial.inc index 788dcc2e5..f4616d54b 100644 --- a/gosa-plugins/samba/personal/samba/class_sambaMungedDial.inc +++ b/gosa-plugins/samba/personal/samba/class_sambaMungedDial.inc @@ -160,7 +160,7 @@ class sambaMungedDial $result_tmp= ""; foreach ($params as $paramName => $paramValue) { /* String parameter? */ - if (in_array($paramName, $this->stringParams)){ + if (in_array_strict($paramName, $this->stringParams)){ $isString= TRUE; $paramValue= sambaMungedDial::strhex($paramValue.chr(0).chr(0)); } else { @@ -168,7 +168,7 @@ class sambaMungedDial } /* Time parameter? */ - if (in_array($paramName, $this->timeParams)){ + if (in_array_strict($paramName, $this->timeParams)){ $paramValue= sambaMungedDial::genTime($paramValue); } @@ -260,11 +260,11 @@ class sambaMungedDial $ctxParm= substr($ctxField, 0, $ctxParmLength); /* If string parameter, convert */ - if (in_array($ctxParmName, $this->stringParams)){ + if (in_array_strict($ctxParmName, $this->stringParams)){ $ctxParm= sambaMungedDial::hexstr($ctxParm); } /* If time parameter, convert */ - if (in_array($ctxParmName, $this->timeParams)){ + if (in_array_strict($ctxParmName, $this->timeParams)){ $ctxParm= sambaMungedDial::readTime($ctxParm); } diff --git a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc index ec108855e..d377105a9 100644 --- a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc +++ b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc @@ -396,7 +396,7 @@ class scalixAccount extends plugin foreach (array("scalixEmailAddress") as $val){ - if (in_array($val, $skip)){ + if (in_array_strict($val, $skip)){ continue; } @@ -433,7 +433,7 @@ class scalixAccount extends plugin } /* Add to list of alternates */ - if (!in_array($address, $this->scalixEmailAddress)){ + if (!in_array_strict($address, $this->scalixEmailAddress)){ $this->scalixEmailAddress[]= $address; $this->is_modified= TRUE; } diff --git a/gosa-plugins/squid/personal/connectivity/squid/class_proxyAccount.inc b/gosa-plugins/squid/personal/connectivity/squid/class_proxyAccount.inc index 07e1836be..8251a3723 100644 --- a/gosa-plugins/squid/personal/connectivity/squid/class_proxyAccount.inc +++ b/gosa-plugins/squid/personal/connectivity/squid/class_proxyAccount.inc @@ -141,7 +141,7 @@ class proxyAccount extends plugin /* Assign filter settings */ $smarty->assign("changeB",$changeB); foreach(array("T","B","F") as $attr){ - if(in_array("filter".$attr,$this->multi_boxes)){ + if(in_array_strict("filter".$attr,$this->multi_boxes)){ $smarty->assign("use_filter".$attr,TRUE); }else{ $smarty->assign("use_filter".$attr,FALSE); @@ -156,7 +156,7 @@ class proxyAccount extends plugin $smarty->assign('proxyAccountACL', $this->getacl("",$this->ReadOnly)); } - $smarty->assign("use_proxy",in_array("proxy",$this->multi_boxes)); + $smarty->assign("use_proxy",in_array_strict("proxy",$this->multi_boxes)); $smarty->assign("multiple_support",$this->multiple_support_active); $display.= $smarty->fetch(get_template_path('proxy.tpl', TRUE, dirname(__FILE__))); return($display); @@ -376,22 +376,22 @@ class proxyAccount extends plugin public function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("proxy",$this->multi_boxes)){ + if(in_array_strict("proxy",$this->multi_boxes)){ $ret['is_account'] = $this->is_account; } - if(in_array("filterT",$this->multi_boxes)){ + if(in_array_strict("filterT",$this->multi_boxes)){ $ret['gosaProxyWorkingStart'] = $this->gosaProxyWorkingStart; $ret['gosaProxyWorkingStop'] = $this->gosaProxyWorkingStop; } - if(in_array("filterB",$this->multi_boxes)){ + if(in_array_strict("filterB",$this->multi_boxes)){ $ret['gosaProxyQuota'] = $this->gosaProxyQuota; $ret['gosaProxyQuotaPeriod'] = $this->gosaProxyQuotaPeriod; } foreach(array("B","T","F") as $attr){ $name = "filter".$attr; - if(in_array($name,$this->multi_boxes)){ + if(in_array_strict($name,$this->multi_boxes)){ $ret[$name] = preg_match("/".$attr."/",$this->gosaProxyAcctFlags); } } @@ -432,7 +432,7 @@ class proxyAccount extends plugin public function init_multiple_support($attrs,$all) { plugin::init_multiple_support($attrs,$all); - if(isset($attrs['objectClass']) && in_array("gosaProxyAccount",$attrs['objectClass'])){ + if(isset($attrs['objectClass']) && in_array_strict("gosaProxyAccount",$attrs['objectClass'])){ $this->is_account = TRUE; } } diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc index 1213e3f8f..d52deed84 100644 --- a/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc +++ b/gosa-plugins/sudo/admin/sudo/class_sudoGeneric.inc @@ -159,12 +159,12 @@ class sudo extends plugin if(isset($_POST['userGroupSelect_save']) && $this->dialog instanceof userGroupSelect){ if($this->acl_is_writeable("sudoUser")){ foreach($this->dialog->save() as $entry){ - if(in_array("posixGroup",$entry['objectClass'])){ + if(in_array_strict("posixGroup",$entry['objectClass'])){ $name = trim("%".$entry['cn'][0]); }elseif(isset($entry['uid'][0])){ $name = trim($entry['uid'][0]); } - if(!in_array($name,$this->sudoUser) && !in_array("!".$name,$this->sudoUser)){ + if(!in_array_strict($name,$this->sudoUser) && !in_array_strict("!".$name,$this->sudoUser)){ $this->sudoUser[] = $name; } } @@ -209,7 +209,7 @@ class sudo extends plugin if($this->acl_is_writeable("sudoHost")){ foreach($this->dialog->save() as $entry){ $cn = trim($entry['cn'][0]); - if(!in_array($cn,$this->sudoHost) && !in_array("!".$cn,$this->sudoHost)){ + if(!in_array_strict($cn,$this->sudoHost) && !in_array_strict("!".$cn,$this->sudoHost)){ $this->sudoHost[] = $cn; } } diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoOption.inc b/gosa-plugins/sudo/admin/sudo/class_sudoOption.inc index a9a33c1e4..e33e2f748 100644 --- a/gosa-plugins/sudo/admin/sudo/class_sudoOption.inc +++ b/gosa-plugins/sudo/admin/sudo/class_sudoOption.inc @@ -166,7 +166,7 @@ class sudoOption extends plugin Some attributes like (BOOL_INTEGER) can be TRUE/FALSE and INTEGER. This means, if the value is empty it is BOOL and $negation defines its boolean value. */ - if(in_array($this->options[$opt]['TYPE'],array("BOOL_INTEGER","STRING_BOOL"))){ + if(in_array_strict($this->options[$opt]['TYPE'],array("BOOL_INTEGER","STRING_BOOL"))){ if(empty($value)){ $option['NEGATE'] = FALSE; if($negation){ @@ -178,7 +178,7 @@ class sudoOption extends plugin } /* Special handling for BOOLEAN values */ - if(in_array($this->options[$opt]['TYPE'],array("BOOLEAN"))){ + if(in_array_strict($this->options[$opt]['TYPE'],array("BOOLEAN"))){ $option['NEGATE'] = FALSE; if($negation){ $option['VALUE'] = "FALSE"; @@ -223,8 +223,8 @@ class sudoOption extends plugin /***** Negate STRING_BOOL && BOOL_INTEGER *****/ - if(in_array($this->options[$opt]['TYPE'],array('STRING_BOOL','BOOL_INTEGER'))){ - if(in_array($val, array("TRUE","FALSE"))){ + if(in_array_strict($this->options[$opt]['TYPE'],array('STRING_BOOL','BOOL_INTEGER'))){ + if(in_array_strict($val, array("TRUE","FALSE"))){ if($val == "TRUE"){ $this->sudoOption[$opt][$id]["VALUE"] = "FALSE"; }else{ @@ -238,14 +238,14 @@ class sudoOption extends plugin /***** Negate STRING / INTEGER *****/ - if(in_array($this->options[$opt]['TYPE'],array('STRING','INTEGER','LISTS'))){ + if(in_array_strict($this->options[$opt]['TYPE'],array('STRING','INTEGER','LISTS'))){ $this->sudoOption[$opt][$id]['NEGATE'] = !$this->sudoOption[$opt][$id]['NEGATE']; } /***** Negate BOOLEAN *****/ - if(in_array($this->options[$opt]['TYPE'],array('BOOLEAN'))){ + if(in_array_strict($this->options[$opt]['TYPE'],array('BOOLEAN'))){ if($val == "TRUE"){ $this->sudoOption[$opt][$id]["VALUE"] = "FALSE"; }else{ @@ -337,7 +337,7 @@ class sudoOption extends plugin /**** Get posted value for BOOLEAN ****/ - if(in_array($this->options[$name]['TYPE'],array("BOOLEAN"))){ + if(in_array_strict($this->options[$name]['TYPE'],array("BOOLEAN"))){ if(isset($_POST['option_value__'.$name.'_'.$id])){ $this->sudoOption[$name][$id]["VALUE"] = get_post('option_value__'.$name.'_'.$id); } @@ -346,7 +346,7 @@ class sudoOption extends plugin /**** Get posted value for STRING / INTEGER ****/ - if(in_array($this->options[$name]['TYPE'],array("STRING","INTEGER"))){ + if(in_array_strict($this->options[$name]['TYPE'],array("STRING","INTEGER"))){ if(isset($_POST['option_value__'.$name.'_'.$id])){ $this->sudoOption[$name][$id]["VALUE"] = get_post('option_value__'.$name.'_'.$id); } @@ -355,7 +355,7 @@ class sudoOption extends plugin /**** Get posted value for STRING_BOOL / BOOL_INTEGER ****/ - if(in_array($this->options[$name]['TYPE'],array("BOOL_INTEGER","STRING_BOOL"))){ + if(in_array_strict($this->options[$name]['TYPE'],array("BOOL_INTEGER","STRING_BOOL"))){ if(isset($_POST['option_selection__'.$name.'_'.$id])){ $sel = get_post('option_selection__'.$name.'_'.$id); $val = ""; @@ -375,7 +375,7 @@ class sudoOption extends plugin /**** Get posted value for LISTS ****/ - if(in_array($this->options[$name]['TYPE'],array("LISTS"))){ + if(in_array_strict($this->options[$name]['TYPE'],array("LISTS"))){ foreach($this->sudoOption[$name] as $entry_key => $entry){ if(isset($_POST['list_value__'.$name.'_'.$entry_key])){ $val = get_post('list_value__'.$name.'_'.$entry_key); @@ -424,7 +424,7 @@ class sudoOption extends plugin /**** Save BOOLEAN ****/ - if(in_array($type,array("BOOLEAN"))){ + if(in_array_strict($type,array("BOOLEAN"))){ $option = $name; if($value == "FALSE"){ $option = "!".$option; @@ -434,7 +434,7 @@ class sudoOption extends plugin /**** Save STRING / INTEGER ****/ - if(in_array($type,array("STRING","INTEGER"))){ + if(in_array_strict($type,array("STRING","INTEGER"))){ if($value != ""){ $option = $name."=".$value; }else{ @@ -448,7 +448,7 @@ class sudoOption extends plugin /**** Save STRING_BOOL / BOOL_INTEGER ****/ - if(in_array($type,array("STRING_BOOL","BOOL_INTEGER"))){ + if(in_array_strict($type,array("STRING_BOOL","BOOL_INTEGER"))){ if($value == "FALSE"){ $option = "!".$name; }elseif($value == "TRUE"){ diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc index c16558ed8..a086d8cdb 100644 --- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc +++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc @@ -18,49 +18,49 @@ class filterSYSTEMS { preg_match("/".preg_quote(get_ou("ArpNewDevice", "systemIncomingRDN"),'/')."/i", $entry['dn'])){ // Detect incoming types - if(in_array('gotoWorkstation', $entry['objectClass'])){ + if(in_array_strict('gotoWorkstation', $entry['objectClass'])){ $entries[$key]['objectClass'][] = 'FAKE_OC_NewWorkstation'; $entries[$key]['cn'][0].= " ("._("New workstation").")"; - }elseif(in_array('gotoTerminal', $entry['objectClass'])){ + }elseif(in_array_strict('gotoTerminal', $entry['objectClass'])){ $entries[$key]['objectClass'][] = 'FAKE_OC_NewTerminal'; $entries[$key]['cn'][0].= " ("._("New terminal").")"; }elseif($arp_handling_active && - in_array('GOhard', $entry['objectClass']) && + in_array_strict('GOhard', $entry['objectClass']) && !isset($entry['gotoMode'][0])){ $entries[$key]['objectClass'][] = 'FAKE_OC_ArpNewDevice'; $entries[$key]['cn'][0].= " ("._("New unknown device").")"; - }elseif(in_array('GOhard', $entry['objectClass'])){ + }elseif(in_array_strict('GOhard', $entry['objectClass'])){ $entries[$key]['objectClass'][] = 'FAKE_OC_NewDevice'; $entries[$key]['cn'][0].= " ("._("New device").")"; } // Detect SAMBA machines - }elseif(in_array('sambaSamAccount', $entry['objectClass']) && preg_match("/\$$/", $entry['cn'][0])){ + }elseif(in_array_strict('sambaSamAccount', $entry['objectClass']) && preg_match("/\$$/", $entry['cn'][0])){ $entries[$key]['objectClass'][] = 'FAKE_OC_winstation'; // Detect Workstation & templates - }elseif(in_array('gotoWorkstation', $entry['objectClass'])){ + }elseif(in_array_strict('gotoWorkstation', $entry['objectClass'])){ $pwd_acl = $ui->get_permissions($entry['dn'],'workstation/workgeneric','userPassword'); if(preg_match("/w/",$pwd_acl)){ $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble'; } // Detect Terminal & templates - }elseif(in_array('gotoTerminal', $entry['objectClass'])){ + }elseif(in_array_strict('gotoTerminal', $entry['objectClass'])){ $pwd_acl = $ui->get_permissions($entry['dn'],'terminal/termgeneric','userPassword'); if(preg_match("/w/",$pwd_acl)){ $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble'; } // Detect Server & templates - }elseif(in_array('goServer', $entry['objectClass'])){ + }elseif(in_array_strict('goServer', $entry['objectClass'])){ $pwd_acl = $ui->get_permissions($entry['dn'],'server/servgeneric','userPassword'); if(preg_match("/w/",$pwd_acl)){ $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble'; } // Detect ieee802Device - }elseif(in_array('ieee802Device', $entry['objectClass'])){ + }elseif(in_array_strict('ieee802Device', $entry['objectClass'])){ $pwd_acl = $ui->get_permissions($entry['dn'],'component/componentGeneric','userPassword'); if(preg_match("/w/",$pwd_acl)){ $entries[$key]['objectClass'][] = 'FAKE_OC_PWD_changeAble'; @@ -70,7 +70,7 @@ class filterSYSTEMS { // Detect object states $state = 'none'; foreach(array('gotoWorkstation','gotoTerminal','goServer') as $type){ - if(in_array($type, $entry['objectClass'])){ + if(in_array_strict($type, $entry['objectClass'])){ if(isset($entry['FAIstate'][0])){ switch (preg_replace('/:.*$/', '', $entry['FAIstate'][0])) { diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index a56fbe7f9..39835f227 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -165,7 +165,7 @@ class systemManagement extends management $entry = $headpage->getEntry($dn); $ui = get_userinfo(); $smarty = get_smarty(); - if(in_array("FAKE_OC_PWD_changeAble", $entry['objectClass'])){ + if(in_array_strict("FAKE_OC_PWD_changeAble", $entry['objectClass'])){ $acl = $tDefs[$type]['aclCategory'].'/'.$tDefs[$type]['aclClass']; $tabacl = $ui->get_permissions($dn,$acl,"userPassword"); if(preg_match("/w/",$tabacl)){ @@ -268,7 +268,7 @@ class systemManagement extends management $ui = get_userinfo(); $smarty = get_smarty(); - if(!in_array('FAKE_OC_PWD_changeAble', $entry['objectClass'])){ + if(!in_array_strict('FAKE_OC_PWD_changeAble', $entry['objectClass'])){ trigger_error("Tried to change pwd, for invalid object!"); }elseif (get_post('new_password') != get_post('repeated_password')){ msg_dialog::display(_("Error"), @@ -292,7 +292,7 @@ class systemManagement extends management /* Remove password attribute */ - if(in_array("simpleSecurityObject",$old_attrs['objectClass'])){ + if(in_array_strict("simpleSecurityObject",$old_attrs['objectClass'])){ $attrs['objectClass'] = array(); for($i = 0 ; $i < $old_attrs['objectClass']['count'] ; $i ++){ if(!preg_match("/simpleSecurityObject/i",$old_attrs['objectClass'][$i])){ @@ -305,7 +305,7 @@ class systemManagement extends management /* Add/modify password attribute */ - if(!in_array("simpleSecurityObject",$old_attrs['objectClass'])){ + if(!in_array_strict("simpleSecurityObject",$old_attrs['objectClass'])){ $attrs['objectClass'] = array(); for($i = 0 ; $i < $old_attrs['objectClass']['count'] ; $i ++){ $attrs['objectClass'][] = $old_attrs['objectClass'][$i]; @@ -490,13 +490,13 @@ class systemManagement extends management /* Skip installation or update trigerred events, * if this entry is currently processing. */ - if($triggered && in_array($event,array("DaemonEvent_reinstall","DaemonEvent_update"))){ + if($triggered && in_array_strict($event,array("DaemonEvent_reinstall","DaemonEvent_update"))){ foreach($mac as $key => $mac_address){ foreach($o_queue->get_entries_by_mac(array($mac_address)) as $entry){ $entry['STATUS'] = strtoupper($entry['STATUS']); if($entry['STATUS'] == "PROCESSING" && isset($events['QUEUED'][$entry['HEADERTAG']]) && - in_array($events['QUEUED'][$entry['HEADERTAG']],array("DaemonEvent_reinstall","DaemonEvent_update"))){ + in_array_strict($events['QUEUED'][$entry['HEADERTAG']],array("DaemonEvent_reinstall","DaemonEvent_update"))){ unset($mac[$key]); new log("security","systems/".get_class($this),"",array(),"Skip adding 'DaemonEvent::".$type."' for mac '".$mac_address."', there is already a job in progress."); @@ -1075,7 +1075,7 @@ class systemManagement extends management $ocs = $attrs['objectClass']; unset($ocs['count']); $new_attrs = array(); - if(!in_array("FAIobject",$ocs)){ + if(!in_array_strict("FAIobject",$ocs)){ $ocs[] = "FAIobject"; $new_attrs['objectClass'] = $ocs; } diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc index 2f8f55fc0..b4db0038b 100644 --- a/gosa-plugins/systems/admin/systems/class_termDNS.inc +++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc @@ -636,12 +636,12 @@ class termDNS extends plugin /* Check if mac and ip are already used */ if(!empty($this->ipHostNumber) && $this->DNS_is_account && $this->ipHostNumber != $this->orig_ipHostNumber && - in_array("ip:".$this->ipHostNumber,$this->used_ip_mac)){ + in_array_strict("ip:".$this->ipHostNumber,$this->used_ip_mac)){ $message[]= msgPool::duplicated(_("IP address")); } if(!empty($this->macAddress) && $this->dhcp_is_Account && $this->macAddress != $this->orig_macAddress && - in_array("mac:".$this->macAddress,$this->used_ip_mac)){ + in_array_strict("mac:".$this->macAddress,$this->used_ip_mac)){ $message[]= msgPool::duplicated(_("MAC address")); } @@ -1174,7 +1174,7 @@ class termDNS extends plugin } // Search the next free and valid ip. - while(in_array(implode(".",$ip_data),$list) || $ip_data[3] <= 1){ + while(in_array_strict(implode(".",$ip_data),$list) || $ip_data[3] <= 1){ $ip_data[3] ++ ; if($ip_data[3] > 255){ $ip_data[3] = 1 ; diff --git a/gosa-plugins/systems/admin/systems/tabs_server.inc b/gosa-plugins/systems/admin/systems/tabs_server.inc index 2c64b981a..d4ae74993 100644 --- a/gosa-plugins/systems/admin/systems/tabs_server.inc +++ b/gosa-plugins/systems/admin/systems/tabs_server.inc @@ -73,7 +73,7 @@ class servtabs extends tabs $baseobject= NULL; foreach($this->by_object as $name => $object){ $class = get_class($object); - if(in_array($class,array("reference","acl"))) continue; + if(in_array_strict($class,array("reference","acl"))) continue; if ($baseobject === NULL){ $baseobject= new $class($this->config, $this->dn,NULL,$this); $baseobject->enable_CSN_check(); diff --git a/gosa-plugins/webdav/personal/connectivity/webdav/class_webdavAccount.inc b/gosa-plugins/webdav/personal/connectivity/webdav/class_webdavAccount.inc index a14ab48ab..b4f2007c9 100644 --- a/gosa-plugins/webdav/personal/connectivity/webdav/class_webdavAccount.inc +++ b/gosa-plugins/webdav/personal/connectivity/webdav/class_webdavAccount.inc @@ -61,7 +61,7 @@ class webdavAccount extends plugin $smarty->assign('webdavAccountACL', $this->getacl("",$this->ReadOnly)); } - $smarty->assign("use_webdav",in_array("webdav",$this->multi_boxes)); + $smarty->assign("use_webdav",in_array_strict("webdav",$this->multi_boxes)); $smarty->assign("multiple_support",$this->multiple_support_active); $display.= $smarty->fetch (get_template_path('webdav.tpl', TRUE, dirname(__FILE__))); return ($display); @@ -204,7 +204,7 @@ class webdavAccount extends plugin function get_multi_edit_values() { $ret = plugin::get_multi_edit_values(); - if(in_array("webdav",$this->multi_boxes)){ + if(in_array_strict("webdav",$this->multi_boxes)){ $ret['is_account'] = $this->is_account; } return($ret); @@ -221,7 +221,7 @@ class webdavAccount extends plugin function init_multiple_support($attrs,$all) { plugin::init_multiple_support($attrs,$all); - if(isset($attrs['objectClass']) && in_array("gosaWebdavAccount",$attrs['objectClass'])){ + if(isset($attrs['objectClass']) && in_array_strict("gosaWebdavAccount",$attrs['objectClass'])){ $this->is_account = TRUE; } } -- 2.30.2