From 2a67eabefa0983a414790d9eac3e1060446dfd88 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 19 Sep 2007 15:47:12 +0000 Subject: [PATCH] Converted a couple of == / === NULL references git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7337 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/password.php | 2 +- include/class_config.inc | 2 +- include/class_ldap.inc | 2 +- include/class_plugin.inc | 2 +- include/class_timezones.inc | 2 +- include/functions.inc | 8 ++++---- include/sieve/class_sieveElement_Comment.inc | 2 +- include/sieve/class_sieveElement_Fileinto.inc | 2 +- include/sieve/class_sieveElement_If.inc | 14 +++++++------- include/sieve/class_sieveElement_Redirect.inc | 2 +- include/sieve/class_sieveElement_Reject.inc | 2 +- include/sieve/class_sieveElement_Require.inc | 2 +- include/sieve/class_sieveElement_Vacation.inc | 2 +- include/sieve/class_tree.inc | 6 +++--- plugins/addons/godfs/class_dfsManagment.inc | 2 +- plugins/addons/mailqueue/class_mailqueue.inc | 2 +- plugins/admin/acl/tabs_acl.inc | 2 +- .../applications/class_applicationGeneric.inc | 2 +- .../applications/class_applicationParameters.inc | 2 +- .../departments/class_departmentManagement.inc | 2 +- plugins/admin/fai/class_faiManagement.inc | 2 +- plugins/admin/fai/class_faiPackage.inc | 2 +- plugins/admin/groups/class_groupApplication.inc | 4 ++-- plugins/admin/groups/class_groupGeneric.inc | 8 ++++---- plugins/admin/groups/class_groupMail.inc | 6 +++--- plugins/admin/ogroups/class_mailogroup.inc | 2 +- plugins/admin/ogroups/class_phonequeue.inc | 2 +- plugins/admin/systems/class_componentGeneric.inc | 2 +- plugins/admin/systems/class_glpiAttachmentPool.inc | 2 +- plugins/admin/systems/class_phoneGeneric.inc | 2 +- plugins/admin/systems/class_printGeneric.inc | 4 ++-- plugins/admin/systems/class_printerPPDDialog.inc | 4 ++-- plugins/admin/systems/class_servDHCP.inc | 2 +- plugins/admin/systems/class_servDNS.inc | 2 +- plugins/admin/systems/class_servGeneric.inc | 2 +- plugins/admin/systems/class_servRepository.inc | 2 +- plugins/admin/systems/class_serverService.inc | 2 +- plugins/admin/systems/class_terminalGeneric.inc | 2 +- plugins/admin/systems/class_terminalInfo.inc | 2 +- plugins/admin/systems/class_terminalService.inc | 2 +- plugins/admin/systems/class_terminalStartup.inc | 2 +- plugins/admin/systems/class_winGeneric.inc | 2 +- plugins/admin/systems/class_workstationGeneric.inc | 2 +- plugins/admin/systems/class_workstationStartup.inc | 2 +- plugins/admin/systems/tabs_printers.inc | 2 +- plugins/admin/systems/tabs_terminal.inc | 2 +- plugins/admin/systems/tabs_workstation.inc | 2 +- plugins/generic/references/class_reference.inc | 2 +- plugins/gofax/faxaccount/class_gofaxAccount.inc | 4 ++-- plugins/gofon/macro/class_gofonMacroParameters.inc | 2 +- plugins/gofon/phoneaccount/class_phoneAccount.inc | 10 +++++----- .../personal/connectivity/class_connectivity.inc | 4 ++-- .../connectivity/class_intranetAccount.inc | 2 +- .../connectivity/class_oxchangeAccount.inc | 2 +- .../personal/connectivity/class_webdavAccount.inc | 2 +- plugins/personal/environment/class_environment.inc | 2 +- plugins/personal/environment/main.inc | 2 +- plugins/personal/generic/class_user.inc | 4 ++-- plugins/personal/nagios/class_nagiosAccount.inc | 4 ++-- plugins/personal/netatalk/class_netatalk.inc | 6 +++--- plugins/personal/samba/class_sambaAccount.inc | 4 ++-- plugins/personal/scalix/class_scalixAccount.inc | 6 +++--- 62 files changed, 94 insertions(+), 94 deletions(-) diff --git a/html/password.php b/html/password.php index 5348a4531..29e1edbf2 100644 --- a/html/password.php +++ b/html/password.php @@ -218,7 +218,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){ /* Do we have the selected user somewhere? */ $ui= ldap_login_user ($uid, $current_password); - if ($ui == NULL){ + if ($ui === NULL){ $message[]= _("Please check the username/password combination."); } else { $acls = $ui->get_permissions($ui->dn,"users/password"); diff --git a/include/class_config.inc b/include/class_config.inc index e16945b88..d8d28684e 100644 --- a/include/class_config.inc +++ b/include/class_config.inc @@ -308,7 +308,7 @@ class config { function load_servers () { /* Only perform actions if current is set */ - if ($this->current == NULL){ + if ($this->current === NULL){ return; } diff --git a/include/class_ldap.inc b/include/class_ldap.inc index dbc76f585..17ae13ff4 100644 --- a/include/class_ldap.inc +++ b/include/class_ldap.inc @@ -857,7 +857,7 @@ class LDAP{ $url= preg_replace('!\?\?.*$!', '', $url); $server= preg_replace('!^([^:]+://[^/]+)/.*$!', '\\1', $url); - if ($referrals == NULL){ + if ($referrals === NULL){ $referrals= $this->referrals; } diff --git a/include/class_plugin.inc b/include/class_plugin.inc index 6be4321c6..b4b36269f 100644 --- a/include/class_plugin.inc +++ b/include/class_plugin.inc @@ -141,7 +141,7 @@ class plugin /* Get LDAP descriptor */ $ldap= $this->config->get_ldap_link(); - if ($dn != NULL){ + if ($dn !== NULL){ /* Load data to 'attrs' and save 'dn' */ if ($parent !== NULL){ diff --git a/include/class_timezones.inc b/include/class_timezones.inc index 8c3ae9969..6321d8644 100644 --- a/include/class_timezones.inc +++ b/include/class_timezones.inc @@ -33,7 +33,7 @@ function get_default_timezone($stamp = NULL) $zone = array("name" => "unconfigured", "value" => 0); /* Use current timestamp if $stamp is not set */ - if($stamp == NULL){ + if($stamp === NULL){ $stamp = time(); } diff --git a/include/functions.inc b/include/functions.inc index 7532e479a..c27314d87 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -135,7 +135,7 @@ function get_browser_language() /* Try to use users primary language */ global $config; $ui= get_userinfo(); - if ($ui != NULL){ + if ($ui !== NULL){ if ($ui->language != ""){ return ($ui->language.".UTF-8"); } @@ -1029,7 +1029,7 @@ function print_red() $_SESSION['errorsAlreadyPosted'][$string]++; }else{ - if($string != NULL){ + if($string !== NULL){ if (preg_match("/"._("LDAP error:")."/", $string)){ $addmsg= _("Problems with the LDAP server mean that you probably lost the last changes. Please check your LDAP setup for possible errors and try again."); $img= "images/error.png"; @@ -2092,7 +2092,7 @@ function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false) $keep = ""; // save last failed parse string /* Check each parsed dn in ldap ? */ - if($config!=NULL && $verify_in_ldap){ + if($config!==NULL && $verify_in_ldap){ $ldap = $config->get_ldap_link(); } @@ -2110,7 +2110,7 @@ function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false) $called = true; /* Check if current dn is valid */ - if($ldap!=NULL){ + if($ldap!==NULL){ $ldap->cd($dn); $ldap->cat($dn,array("dn")); if($ldap->count()){ diff --git a/include/sieve/class_sieveElement_Comment.inc b/include/sieve/class_sieveElement_Comment.inc index c3e126cec..deaa4f312 100644 --- a/include/sieve/class_sieveElement_Comment.inc +++ b/include/sieve/class_sieveElement_Comment.inc @@ -17,7 +17,7 @@ class sieve_comment { $this->object_id = $object_id; - if($data == NULL){ + if($data === NULL){ $data = array('ELEMENTS' => array(array('class' => "quoted-string" ,"text" => "/*"._("Your comment here")."*/"))); } diff --git a/include/sieve/class_sieveElement_Fileinto.inc b/include/sieve/class_sieveElement_Fileinto.inc index f357d37d9..dc3923f41 100644 --- a/include/sieve/class_sieveElement_Fileinto.inc +++ b/include/sieve/class_sieveElement_Fileinto.inc @@ -42,7 +42,7 @@ class sieve_fileinto $mbs = $this->get_mail_boxes(); /* Set the default mailbox */ - if($data == NULL){ + if($data === NULL){ $data = array('ELEMENTS' => array(array('class' => "quoted-string" ,"text" => $mbs[key($mbs)]))); } diff --git a/include/sieve/class_sieveElement_If.inc b/include/sieve/class_sieveElement_If.inc index acdcb94d5..cb33ae5e7 100644 --- a/include/sieve/class_sieveElement_If.inc +++ b/include/sieve/class_sieveElement_If.inc @@ -53,7 +53,7 @@ class sieve_if "ne" => _("not equal")); /* Skip parsing if this element is new */ - if($elements != NULL){ + if($elements !== NULL){ /* Remove comments from tests */ $tmp = array(); @@ -64,7 +64,7 @@ class sieve_if } $elements['ELEMENTS'] = $tmp; - if($elements!=NULL){ + if($elements!==NULL){ $this->elements = $elements; $this->_parsed = $this->_parse($elements['ELEMENTS'],1); } @@ -94,11 +94,11 @@ class sieve_if function check_recursive($parsed = NULL,$id = 1,$obj_id=1) { $ret = array(); - if($parsed == NULL){ + if($parsed === NULL){ $parsed = $this->_parsed; } - if($parsed == NULL) { + if($parsed === NULL) { return(array(_("Can't save empty tests."))); } @@ -162,7 +162,7 @@ class sieve_if function get_sieve_script_part_recursive($parsed = NULL,$id = 1,$obj_id=1) { $script =""; - if($parsed == NULL){ + if($parsed === NULL){ $parsed = $this->_parsed; } @@ -525,7 +525,7 @@ class sieve_if { /* Variable initialization */ $ret =""; - if($parsed == NULL){ + if($parsed === NULL){ $parsed = $this->_parsed; } @@ -863,7 +863,7 @@ class sieve_if function get_as_html($parsed = NULL,$id = 1,$obj_id=1) { $ret =""; - if($parsed == NULL){ + if($parsed === NULL){ $parsed = $this->_parsed; } diff --git a/include/sieve/class_sieveElement_Redirect.inc b/include/sieve/class_sieveElement_Redirect.inc index 33ebeb05d..64e71b6f8 100644 --- a/include/sieve/class_sieveElement_Redirect.inc +++ b/include/sieve/class_sieveElement_Redirect.inc @@ -31,7 +31,7 @@ class sieve_redirect { $this->object_id = $object_id; - if($data == NULL){ + if($data === NULL){ $data = array('ELEMENTS' => array(array('class' => "quoted-string" ,"text" => _("Place a mail address here")))); } diff --git a/include/sieve/class_sieveElement_Reject.inc b/include/sieve/class_sieveElement_Reject.inc index baa100449..3f0726011 100644 --- a/include/sieve/class_sieveElement_Reject.inc +++ b/include/sieve/class_sieveElement_Reject.inc @@ -33,7 +33,7 @@ class sieve_reject * (This is the case when we add new elements in the ui) * Set a default text. */ - if($data == NULL){ + if($data === NULL){ $this->data = _("Your reject text here"); }else{ diff --git a/include/sieve/class_sieveElement_Require.inc b/include/sieve/class_sieveElement_Require.inc index 9ef9e2985..a9b689034 100644 --- a/include/sieve/class_sieveElement_Require.inc +++ b/include/sieve/class_sieveElement_Require.inc @@ -11,7 +11,7 @@ class sieve_require { $this->parent = $parent; $this->object_id = $object_id; - if($data != NULL){ + if($data !== NULL){ for($i = 0 ; $i < count($data['ELEMENTS']) ; $i++){ $tmp = sieve_get_strings($data['ELEMENTS'],$i); diff --git a/include/sieve/class_sieveElement_Vacation.inc b/include/sieve/class_sieveElement_Vacation.inc index 0f6a7c6d3..43c754637 100644 --- a/include/sieve/class_sieveElement_Vacation.inc +++ b/include/sieve/class_sieveElement_Vacation.inc @@ -27,7 +27,7 @@ class sieve_vacation $known_attrs = array(":days",":subject",":from",":mime",":handle"); /* skip if empty */ - if(($data == NULL) || !is_array($data)) return; + if(($data === NULL) || !is_array($data)) return; /* Walk through elements */ $p= count($data['ELEMENTS']); diff --git a/include/sieve/class_tree.inc b/include/sieve/class_tree.inc index 37198f0cd..d4bdfc764 100644 --- a/include/sieve/class_tree.inc +++ b/include/sieve/class_tree.inc @@ -101,7 +101,7 @@ class Tree function setDumpFunc($callback) { - if ($callback == NULL || is_callable($callback)) + if ($callback === NULL || is_callable($callback)) { $this->dumpFn_ = $callback; } @@ -128,7 +128,7 @@ class Tree } $node = $this->nodes_[$node_id]; - if ($this->dumpFn_ != NULL) + if ($this->dumpFn_ !== NULL) { $this->dump_ .= $prefix . $infix . call_user_func($this->dumpFn_, $node) . "\n"; } @@ -150,4 +150,4 @@ class Tree } } -?> \ No newline at end of file +?> diff --git a/plugins/addons/godfs/class_dfsManagment.inc b/plugins/addons/godfs/class_dfsManagment.inc index 4b527643e..913b2707e 100644 --- a/plugins/addons/godfs/class_dfsManagment.inc +++ b/plugins/addons/godfs/class_dfsManagment.inc @@ -199,7 +199,7 @@ class dfsManagment extends plugin { $treeMenu = new HTML_TreeMenu_DHTML($tree, array('images' => 'images', 'defaultClass' => 'treeMenuDefault')); $tree_html = $treeMenu->toHTML(); - if ($this->dfstab == NULL) { + if ($this->dfstab === NULL) { if (($message = check_sizelimit()) != "") { return ($message); diff --git a/plugins/addons/mailqueue/class_mailqueue.inc b/plugins/addons/mailqueue/class_mailqueue.inc index 7d8762107..3e34bfc79 100644 --- a/plugins/addons/mailqueue/class_mailqueue.inc +++ b/plugins/addons/mailqueue/class_mailqueue.inc @@ -211,7 +211,7 @@ class mailqueue extends plugin if($str = @$this->pass_cmd ($q_cmd)){ /* If there is no parser available, create one */ - if($mailQueueParser == NULL){ + if($mailQueueParser === NULL){ $mailQueueParser = new parseMailQueue($str,$ServerID); }else{ $mailQueueParser->parseAdditionalQueue($str,$ServerID); diff --git a/plugins/admin/acl/tabs_acl.inc b/plugins/admin/acl/tabs_acl.inc index 3ac215863..7187e2330 100644 --- a/plugins/admin/acl/tabs_acl.inc +++ b/plugins/admin/acl/tabs_acl.inc @@ -17,7 +17,7 @@ class acltab extends tabs $this->by_name[$tab['CLASS']]= $tab['NAME']; - if ($baseobject == NULL){ + if ($baseobject === NULL){ if($tab['CLASS'] == "acl"){ $baseobject= new $tab['CLASS']($this->config, $this, $this->dn); }else{ diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc index 5e8ee67da..875c269f1 100644 --- a/plugins/admin/applications/class_applicationGeneric.inc +++ b/plugins/admin/applications/class_applicationGeneric.inc @@ -129,7 +129,7 @@ class application extends plugin } /* Do we represent a valid group? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' is no application.").""; return ($display); diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc index af3d2d422..c9f5d4241 100644 --- a/plugins/admin/applications/class_applicationParameters.inc +++ b/plugins/admin/applications/class_applicationParameters.inc @@ -49,7 +49,7 @@ class applicationParameters extends plugin /* Show tab dialog headers */ $display= ""; - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove options"), _("This application has options. You can disable them by clicking below.")); diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc index 4e426394a..7628d3f00 100644 --- a/plugins/admin/departments/class_departmentManagement.inc +++ b/plugins/admin/departments/class_departmentManagement.inc @@ -385,7 +385,7 @@ class departmentManagement extends plugin } /* Headpage or normal plugin screen? */ - if ($this->deptabs != NULL){ + if ($this->deptabs !== NULL){ /* Show main page (tabs) */ $display= $this->deptabs->execute(); diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index 8ea8a9028..3ad80f9a5 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -730,7 +730,7 @@ class faiManagement extends plugin * Here we need both, save and cancel */ - if(($this->dialog != NULL) && (isset($this->dialog->config))){ + if(($this->dialog !== NULL) && (isset($this->dialog->config))){ $display .= $this->dialog->execute(); /* Don't show buttons if tab dialog requests this */ diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc index a14352d65..b2bd44049 100644 --- a/plugins/admin/fai/class_faiPackage.inc +++ b/plugins/admin/fai/class_faiPackage.inc @@ -429,7 +429,7 @@ class faiPackage extends plugin /* Generate a list off available packages for this mirror, section and release */ /* Only read this file if it wasn't read before */ - if($this->buffer==NULL){ + if($this->buffer === NULL){ $this->buffer=array(); $a_ret = array(); foreach($this->FAIdebianSection as $sec){ diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index 5a2418c05..a81f3de2f 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -410,7 +410,7 @@ class appgroup extends plugin } /* Do we represent a valid group? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' is no appgroup.").""; return ($display); @@ -418,7 +418,7 @@ class appgroup extends plugin /* Show tab dialog headers */ $display= ""; - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove applications"), _("This group has application features enabled. You can disable them by clicking below.")); diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index aad633524..36b46eae9 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -82,7 +82,7 @@ class group extends plugin /* Is a samba group? */ if (isset($this->attrs['objectClass'])){ - if (array_search ('sambaGroupMapping', $this->attrs['objectClass']) == NULL ){ + if (array_search ('sambaGroupMapping', $this->attrs['objectClass']) === NULL ){ $this->smbgroup= FALSE; } else { $this->smbgroup= TRUE; @@ -90,12 +90,12 @@ class group extends plugin $this->sambaSID= $this->attrs['sambaSID'][0]; } } - if (array_search ('goFonPickupGroup', $this->attrs['objectClass']) == NULL ){ + if (array_search ('goFonPickupGroup', $this->attrs['objectClass']) === NULL ){ $this->fon_group= FALSE; } else { $this->fon_group= TRUE; } - if (array_search ('nagiosContactGroup', $this->attrs['objectClass']) == NULL ){ + if (array_search ('nagiosContactGroup', $this->attrs['objectClass']) === NULL ){ $this->nagios_group= FALSE; } else { $this->nagios_group= TRUE; @@ -188,7 +188,7 @@ class group extends plugin } /* Do we represent a valid group? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' is no group.").""; return ($display); diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index 448f4952d..43f449c18 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -95,7 +95,7 @@ class mailgroup extends plugin /* If this ins't new mailgroup, read all required data from ldap */ - if (($dn != "new")&&($dn != NULL)){ + if (($dn != "new")&&($dn !== NULL)){ /* Load attributes which represent multiple entries */ @@ -333,7 +333,7 @@ class mailgroup extends plugin $display = ""; /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display.= "\"\" ". _("This 'dn' has no valid mail extensions.").""; @@ -342,7 +342,7 @@ class mailgroup extends plugin /* Show tab dialog headers */ $display= ""; - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display.= $this->show_disable_header(_("Remove mail account"), _("This account has mail features enabled. You can disable them by clicking below.")); diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc index 33878acda..7074f25a5 100644 --- a/plugins/admin/ogroups/class_mailogroup.inc +++ b/plugins/admin/ogroups/class_mailogroup.inc @@ -45,7 +45,7 @@ class mailogroup extends plugin } /* Show tab dialog headers */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove mail account"), _("This group has mail features enabled. You can disable them by clicking below.")); diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc index f3e90d73e..be7d69a11 100644 --- a/plugins/admin/ogroups/class_phonequeue.inc +++ b/plugins/admin/ogroups/class_phonequeue.inc @@ -210,7 +210,7 @@ class phonequeue extends plugin } /* Show tab dialog headers */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove the phone queue from this Account"), _("Phone queue is enabled for this group. You can disable it by clicking below.")); diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc index 108f1f405..32530a5b5 100644 --- a/plugins/admin/systems/class_componentGeneric.inc +++ b/plugins/admin/systems/class_componentGeneric.inc @@ -52,7 +52,7 @@ class componentGeneric extends plugin } /* Do we represent a valid phone? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no network features.").""; return($display); diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc index f4453243d..b50066029 100644 --- a/plugins/admin/systems/class_glpiAttachmentPool.inc +++ b/plugins/admin/systems/class_glpiAttachmentPool.inc @@ -33,7 +33,7 @@ class glpiAttachmentPool extends plugin } /* Assign used attributes */ - if($used != NULL){ + if($used !== NULL){ $this->Selected = $used; } } diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index efbb3f1f7..bb4efc357 100644 --- a/plugins/admin/systems/class_phoneGeneric.inc +++ b/plugins/admin/systems/class_phoneGeneric.inc @@ -119,7 +119,7 @@ class phoneGeneric extends plugin } /* Do we represent a valid phone? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no phone features.").""; return($display); diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 57685ac96..a1a4fd37c 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -316,7 +316,7 @@ class printgeneric extends plugin } /* Do we represent a valid printer? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no printer features.").""; return($display); @@ -497,7 +497,7 @@ class printgeneric extends plugin } /* Display dialog, if there is currently one open*/ - if($this->dialog != NULL){ + if($this->dialog !== NULL){ $this->dialog->save_object(); $display = $this->dialog->execute(); return $display; diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc index c3d503b69..edeecca77 100644 --- a/plugins/admin/systems/class_printerPPDDialog.inc +++ b/plugins/admin/systems/class_printerPPDDialog.inc @@ -55,7 +55,7 @@ class printerPPDDialog extends plugin * and set it as selected. * The ppdpath ['link'] should be relative from .../ppd/modified/ * e.g. "/Compaq/Compaq-J1200.ppd" */ - if(($ppdfile!= NULL)&&(strlen($ppdfile)>0)){ + if(($ppdfile!== NULL)&&(strlen($ppdfile)>0)){ $ppdfile = preg_replace("#".$this->pathToModified."#","",$ppdfile); if(!file_exists($this->pathToPPD.$this->pathToModified.$ppdfile)){ print_red(sprintf(_("Can't open '%s', ppd settings resetted."),$ppdfile)); @@ -136,7 +136,7 @@ class printerPPDDialog extends plugin } /* if a dialog is open, print the dialog instead of this class */ - if($this->dialog!=NULL){ + if($this->dialog!==NULL){ $display = $this->dialog->execute(); return($display); } diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc index f22860b68..df62afbed 100644 --- a/plugins/admin/systems/class_servDHCP.inc +++ b/plugins/admin/systems/class_servDHCP.inc @@ -314,7 +314,7 @@ class servdhcp extends goService /* Show dialog */ - if($this->dialog != NULL && !is_int($this->dialog)){ + if($this->dialog !== NULL && !is_int($this->dialog)){ $this->dialog->save_object(); $this->dialog->parent = $this; return($this->dialog->execute()); diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc index b7cb873a4..4f5ed149b 100644 --- a/plugins/admin/systems/class_servDNS.inc +++ b/plugins/admin/systems/class_servDNS.inc @@ -257,7 +257,7 @@ class servdns extends goService /* Show dialog */ - if($this->dialog!= NULL){ + if($this->dialog!== NULL){ $this->dialog->save_object(); $this->dialog->parent = $this; return($this->dialog->execute()); diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index 116628786..1acaaad4c 100644 --- a/plugins/admin/systems/class_servGeneric.inc +++ b/plugins/admin/systems/class_servGeneric.inc @@ -96,7 +96,7 @@ class servgeneric extends plugin } /* Do we represent a valid server? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no server features.").""; return($display); diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc index 03d231405..c7fea3871 100644 --- a/plugins/admin/systems/class_servRepository.inc +++ b/plugins/admin/systems/class_servRepository.inc @@ -239,7 +239,7 @@ class servrepository extends goService $this->is_dialog = false; } - if($this->dialog != NULL){ + if($this->dialog !== NULL){ $this->dialog->save_object(); $this->is_dialog = true; return($this->dialog->execute()); diff --git a/plugins/admin/systems/class_serverService.inc b/plugins/admin/systems/class_serverService.inc index 215bbd712..cb50f5d03 100644 --- a/plugins/admin/systems/class_serverService.inc +++ b/plugins/admin/systems/class_serverService.inc @@ -215,7 +215,7 @@ class ServerService extends plugin /* There is currently a subdialog open, display this dialog */ - if($this->dialog != NULL){ + if($this->dialog !== NULL){ $this->dialog->save_object(); return($this->dialog->execute()); } diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc index 3eef5f61f..57a70ff55 100644 --- a/plugins/admin/systems/class_terminalGeneric.inc +++ b/plugins/admin/systems/class_terminalGeneric.inc @@ -272,7 +272,7 @@ class termgeneric extends plugin } /* Do we represent a valid terminal? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no terminal features.").""; return($display); diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc index 29ee7d335..0b81eb7d3 100644 --- a/plugins/admin/systems/class_terminalInfo.inc +++ b/plugins/admin/systems/class_terminalInfo.inc @@ -68,7 +68,7 @@ class terminfo extends plugin } /* Do we represent a valid terminal? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ echo "\"\" ". _("This 'dn' has no terminal features.").""; return; diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc index 0d07ef0b1..84f84587c 100644 --- a/plugins/admin/systems/class_terminalService.inc +++ b/plugins/admin/systems/class_terminalService.inc @@ -262,7 +262,7 @@ class termservice extends plugin } /* Do we represent a valid terminal? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no terminal features.").""; return ($display); diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc index 33d4ad297..8bab797f4 100644 --- a/plugins/admin/systems/class_terminalStartup.inc +++ b/plugins/admin/systems/class_terminalStartup.inc @@ -163,7 +163,7 @@ class termstartup extends plugin } /* Do we represent a valid terminal? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no terminal features.").""; return ($display); diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc index cbabc12ae..b1778a1a8 100644 --- a/plugins/admin/systems/class_winGeneric.inc +++ b/plugins/admin/systems/class_winGeneric.inc @@ -91,7 +91,7 @@ class wingeneric extends plugin /* Do we represent a valid phone? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no network features.").""; return($display); diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc index a61bf9599..59427c35a 100644 --- a/plugins/admin/systems/class_workstationGeneric.inc +++ b/plugins/admin/systems/class_workstationGeneric.inc @@ -227,7 +227,7 @@ class workgeneric extends plugin } /* Do we represent a valid terminal? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no workstation features.").""; return($display); diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc index 5396a0608..06eb66380 100644 --- a/plugins/admin/systems/class_workstationStartup.inc +++ b/plugins/admin/systems/class_workstationStartup.inc @@ -509,7 +509,7 @@ class workstartup extends plugin } /* Do we represent a valid terminal? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' has no terminal features.").""; return ($display); diff --git a/plugins/admin/systems/tabs_printers.inc b/plugins/admin/systems/tabs_printers.inc index 92c9fbb33..85755a3e9 100644 --- a/plugins/admin/systems/tabs_printers.inc +++ b/plugins/admin/systems/tabs_printers.inc @@ -15,7 +15,7 @@ class printtabs extends tabs foreach ($data as $tab){ $this->by_name[$tab['CLASS']]= $tab['NAME']; - if ($baseobject == NULL){ + if ($baseobject === NULL){ $baseobject= new $tab['CLASS']($this->config, $this->dn,NULL,$this); $this->by_object[$tab['CLASS']]= $baseobject; } else { diff --git a/plugins/admin/systems/tabs_terminal.inc b/plugins/admin/systems/tabs_terminal.inc index 69540dda1..3b9a6c51d 100644 --- a/plugins/admin/systems/tabs_terminal.inc +++ b/plugins/admin/systems/tabs_terminal.inc @@ -14,7 +14,7 @@ class termtabs extends tabs foreach ($data as $tab){ $this->by_name[$tab['CLASS']]= $tab['NAME']; - if ($baseobject == NULL){ + if ($baseobject === NULL){ $baseobject= new $tab['CLASS']($this->config, $this->dn,NULL,$this); $this->by_object[$tab['CLASS']]= $baseobject; } else { diff --git a/plugins/admin/systems/tabs_workstation.inc b/plugins/admin/systems/tabs_workstation.inc index 0fe5667ea..282c372b0 100644 --- a/plugins/admin/systems/tabs_workstation.inc +++ b/plugins/admin/systems/tabs_workstation.inc @@ -15,7 +15,7 @@ class worktabs extends tabs foreach ($data as $tab){ $this->by_name[$tab['CLASS']]= $tab['NAME']; - if ($baseobject == NULL){ + if ($baseobject === NULL){ $baseobject= new $tab['CLASS']($this->config, $this->dn,NULL,$this); $this->by_object[$tab['CLASS']]= $baseobject; } else { diff --git a/plugins/generic/references/class_reference.inc b/plugins/generic/references/class_reference.inc index d808f00ba..472e42e11 100644 --- a/plugins/generic/references/class_reference.inc +++ b/plugins/generic/references/class_reference.inc @@ -106,7 +106,7 @@ class reference extends plugin } foreach ($attrs[$memberattr] as $uid){ $content= $this->getCacheObject($uid); - if ($content == NULL) { + if ($content === NULL) { continue; } $addon.= '   '.$content['name'].''.$content['description'].''.$content['type'].' '; diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc index b617ca5cb..a36811e03 100644 --- a/plugins/gofax/faxaccount/class_gofaxAccount.inc +++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc @@ -156,7 +156,7 @@ class gofaxAccount extends plugin } /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This account has no fax extensions.").""; $display.= back_to_main(); @@ -165,7 +165,7 @@ class gofaxAccount extends plugin /* Show tab dialog headers */ $display= ""; - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove fax account"), _("This account has fax features enabled. You can disable them by clicking below.")); diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc index 614e17d74..5a08d3e22 100755 --- a/plugins/gofon/macro/class_gofonMacroParameters.inc +++ b/plugins/gofon/macro/class_gofonMacroParameters.inc @@ -197,7 +197,7 @@ class macroParameter extends plugin } /* Do we represent a valid group? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This 'dn' is no phone macro.").""; return ($display); diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc index 4fd56b7e4..676a47c74 100644 --- a/plugins/gofon/phoneaccount/class_phoneAccount.inc +++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc @@ -593,7 +593,7 @@ class phoneAccount extends plugin * We should create one i */ foreach($sip_data_array as $s_sip_key=>$s_sip_val){ - if($s_sip_val == NULL) continue; + if($s_sip_val === NULL) continue; $s_sip_values.="'".$s_sip_val."',"; $s_sip_keys .="`".$s_sip_key."`,"; } @@ -660,7 +660,7 @@ class phoneAccount extends plugin */ $s_voi_values = $s_voi_keys = ""; foreach($voice_data_array as $s_voi_key=>$s_voi_val){ - if($s_voi_val == NULL) continue; + if($s_voi_val === NULL) continue; $s_voi_values.="'".$s_voi_val."',"; $s_voi_keys .="`".$s_voi_key."`,"; } @@ -830,7 +830,7 @@ class phoneAccount extends plugin } /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This account has no phone extensions.").""; $display.= back_to_main(); @@ -960,7 +960,7 @@ class phoneAccount extends plugin /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This account has no phone extensions.").""; $display.= back_to_main(); @@ -969,7 +969,7 @@ class phoneAccount extends plugin $display= ""; /* Show tab dialog headers */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove phone account"), _("This account has phone features enabled. You can disable them by clicking below.")); diff --git a/plugins/personal/connectivity/class_connectivity.inc b/plugins/personal/connectivity/class_connectivity.inc index 0704ffe11..70cfd87a7 100644 --- a/plugins/personal/connectivity/class_connectivity.inc +++ b/plugins/personal/connectivity/class_connectivity.inc @@ -56,7 +56,7 @@ class connectivity extends plugin $smarty= get_smarty(); /* Do we represent a valid account? */ - if ($this->parent == NULL){ + if ($this->parent === NULL){ $enabled= true; foreach ($this->plugin_name as $name){ if ($this->plugin[$name]->is_account){ @@ -73,7 +73,7 @@ class connectivity extends plugin } /* Remove checkboxes in single edit mode */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ foreach ($this->plugin_name as $name){ $this->plugin[$name]->parent= $this->parent; } diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc index f5baf7e4c..95781eadf 100644 --- a/plugins/personal/connectivity/class_intranetAccount.inc +++ b/plugins/personal/connectivity/class_intranetAccount.inc @@ -79,7 +79,7 @@ class intranetAccount extends plugin } //! Ever assign vars to smarty in both cases, to avoid php errors (missing variable aso. ) - if ($this->parent != NULL){ + if ($this->parent !== NULL){ $smarty->assign("tabbed", 1); }else{ $smarty->assign("tabbed", 0); diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc index 6fe7b9a45..f21e1e4eb 100644 --- a/plugins/personal/connectivity/class_oxchangeAccount.inc +++ b/plugins/personal/connectivity/class_oxchangeAccount.inc @@ -650,7 +650,7 @@ class oxchangeAccount extends plugin $smarty->assign("timezones", $this->timezones); - if ($this->parent != NULL){ + if ($this->parent !== NULL){ $smarty->assign("tabbed", 1); }else{ $smarty->assign("tabbed", 0); diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc index 7783e7f48..401648a9f 100644 --- a/plugins/personal/connectivity/class_webdavAccount.inc +++ b/plugins/personal/connectivity/class_webdavAccount.inc @@ -47,7 +47,7 @@ class webdavAccount extends plugin $smarty->assign("wstate", "disabled"); } - if ($this->parent != NULL){ + if ($this->parent !== NULL){ $smarty->assign("tabbed", 1); } diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc index 7e902dd98..efd8521eb 100644 --- a/plugins/personal/environment/class_environment.inc +++ b/plugins/personal/environment/class_environment.inc @@ -902,7 +902,7 @@ class environment extends plugin $smarty->assign("gotoPrinterKeys",array_flip($this->printOutPrinterDevices())); /* General behavior */ - if((isset($this->dialog))&&($this->dialog!=NULL)&&(!empty($this->dialog))){ + if((isset($this->dialog))&&($this->dialog!==NULL)&&(!empty($this->dialog))){ $this->dialog->save_object(); $disp =$this->dialog->execute(); diff --git a/plugins/personal/environment/main.inc b/plugins/personal/environment/main.inc index ecd19f8d2..ab6cc2e82 100644 --- a/plugins/personal/environment/main.inc +++ b/plugins/personal/environment/main.inc @@ -96,7 +96,7 @@ if (!$remove_lock){ $display.= "

"; /* Are we in edit mode? */ - if ((isset($_SESSION['edit']))&&($environment->dialog==NULL)){ + if ((isset($_SESSION['edit']))&&($environment->dialog===NULL)){ $display.= "\n"; $display.= " "; $display.= "\n"; diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 617c7eaca..f55a9ddfc 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -151,7 +151,7 @@ class user extends plugin } /* Load data from LDAP? */ - if ($dn != NULL){ + if ($dn !== NULL){ /* Do base conversation */ if ($this->dn == "new"){ @@ -1299,7 +1299,7 @@ class user extends plugin } /* Get back uid/sn/givenName */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ $this->uid= $this->parent->uid; $this->sn= $this->parent->sn; $this->givenName= $this->parent->givenName; diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc index e32e5857a..804ba2ba0 100644 --- a/plugins/personal/nagios/class_nagiosAccount.inc +++ b/plugins/personal/nagios/class_nagiosAccount.inc @@ -105,7 +105,7 @@ class nagiosAccount extends plugin } /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\"src=\"images/stop.png\" ". _("This account has no nagios extensions.").""; @@ -114,7 +114,7 @@ class nagiosAccount extends plugin } /* Show tab dialog headers */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove nagios account"), _("This account has nagios features enabled. You can disable them by clicking below.")); diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc index 8e14e8213..23af26f20 100644 --- a/plugins/personal/netatalk/class_netatalk.inc +++ b/plugins/personal/netatalk/class_netatalk.inc @@ -114,7 +114,7 @@ class netatalk extends plugin { $this->shares = array(); $ldap = $this->config->get_ldap_link(); - if($this->dn === "new" || $this->dn == NULL) { + if($this->dn === "new" || $this->dn === NULL) { $base = $_SESSION['CurrentMainBase']; } else { $base = preg_replace("/^[^,]+,".normalizePreg(get_people_ou())."/","",$this->dn); @@ -170,7 +170,7 @@ class netatalk extends plugin { } /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL) { + if (!$this->is_account && $this->parent === NULL) { $display = "\"\"src=\"images/stop.png\" "._("This account has no netatalk extensions.").""; $display .= back_to_main(); @@ -178,7 +178,7 @@ class netatalk extends plugin { } /* Show tab dialog headers */ - if ($this->parent != NULL) { + if ($this->parent !== NULL) { if ($this->is_account) { $display = $this->show_disable_header(_("Remove netatalk account"), _("This account has netatalk features enabled. You can disable them by clicking below.")); } else { diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc index d66ec57e0..d92c80f75 100644 --- a/plugins/personal/samba/class_sambaAccount.inc +++ b/plugins/personal/samba/class_sambaAccount.inc @@ -207,7 +207,7 @@ class sambaAccount extends plugin $this->is_account= !$this->is_account; } /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\"src=\"images/stop.png\" ". _("This account has no samba extensions.").""; $display.= back_to_main(); @@ -216,7 +216,7 @@ class sambaAccount extends plugin /* Show tab dialog headers */ $display= ""; - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove samba account"), _("This account has samba features enabled. You can disable them by clicking below.")); diff --git a/plugins/personal/scalix/class_scalixAccount.inc b/plugins/personal/scalix/class_scalixAccount.inc index e91448394..a69972fc9 100644 --- a/plugins/personal/scalix/class_scalixAccount.inc +++ b/plugins/personal/scalix/class_scalixAccount.inc @@ -58,7 +58,7 @@ class scalixAccount extends plugin function scalixAccount (&$config, $dn= NULL) { /* dn shouldn't be NULL */ - if($dn == NULL){ + if($dn === NULL){ trigger_error("Initialising scalixAccount without valid dn."); } @@ -115,7 +115,7 @@ class scalixAccount extends plugin $serverLanguages= array("", "GERMAN", "ENGLISH"); /* Do we represent a valid account? */ - if (!$this->is_account && $this->parent == NULL){ + if (!$this->is_account && $this->parent === NULL){ $display= "\"\" ". _("This account has no scalix extensions.").""; @@ -124,7 +124,7 @@ class scalixAccount extends plugin } /* Show tab dialog headers */ - if ($this->parent != NULL){ + if ($this->parent !== NULL){ if ($this->is_account){ $display= $this->show_disable_header(_("Remove scalix account"), _("This account has scalix synchronization enabled. You can disable it by clicking below.")); -- 2.30.2