Module: nagvis
Branch: nagvis-1.4
Commit: ef2f1f8eb16e75bad06f4a3c95681d72c7e6f870
URL:    
http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=ef2f1f8eb16e75bad06f4a3c95681d72c7e6f870

Author: LaMi <[email protected]>
Date:   Sat Nov  7 13:49:58 2009 +0100

 #157 Removed deprecated dl() calls

---

 .../includes/classes/GlobalBackendmerlinmy.php     |   11 +++--------
 .../nagvis/includes/classes/GlobalBackendndomy.php |    9 ++-------
 nagvis/nagvis/includes/classes/GlobalLanguage.php  |   11 +++--------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/nagvis/nagvis/includes/classes/GlobalBackendmerlinmy.php 
b/nagvis/nagvis/includes/classes/GlobalBackendmerlinmy.php
index df485f5..dbab3b0 100644
--- a/nagvis/nagvis/includes/classes/GlobalBackendmerlinmy.php
+++ b/nagvis/nagvis/includes/classes/GlobalBackendmerlinmy.php
@@ -4,7 +4,7 @@
  * GlobalBackendmerlinmy.php - backend class for handling object and state 
  *                             information stored in the Merlin database.
  *
- * Copyright (c) 2004-2008 NagVis Project (Contact: [email protected])
+ * Copyright (c) 2004-2009 NagVis Project (Contact: [email protected])
  *
  * License:
  *
@@ -160,13 +160,8 @@ class GlobalBackendmerlinmy implements 
GlobalBackendInterface {
        private function checkMysqlSupport() {
                // Check availability of PHP MySQL
                if (!extension_loaded('mysql')) {
-                       dl('mysql.so');
-                       if (!extension_loaded('mysql')) {
-                               new GlobalFrontendMessage('ERROR', 
$this->CORE->LANG->getText('mysqlNotSupported', Array('BACKENDID' => 
$this->backendId)));
-                               return FALSE;
-                       } else {
-                               return TRUE;
-                       }
+                       new GlobalFrontendMessage('ERROR', 
$this->CORE->LANG->getText('mysqlNotSupported', Array('BACKENDID' => 
$this->backendId)));
+                       return FALSE;
                } else {
                        return TRUE;    
                }
diff --git a/nagvis/nagvis/includes/classes/GlobalBackendndomy.php 
b/nagvis/nagvis/includes/classes/GlobalBackendndomy.php
index e32cb06..a743249 100644
--- a/nagvis/nagvis/includes/classes/GlobalBackendndomy.php
+++ b/nagvis/nagvis/includes/classes/GlobalBackendndomy.php
@@ -213,13 +213,8 @@ class GlobalBackendndomy implements GlobalBackendInterface 
{
        private function checkMysqlSupport() {
                // Check availability of PHP MySQL
                if (!extension_loaded('mysql')) {
-                       dl('mysql.so');
-                       if (!extension_loaded('mysql')) {
-                               new GlobalFrontendMessage('ERROR', 
$this->CORE->LANG->getText('mysqlNotSupported', Array('BACKENDID' => 
$this->backendId)));
-                               return FALSE;
-                       } else {
-                               return TRUE;
-                       }
+                       new GlobalFrontendMessage('ERROR', 
$this->CORE->LANG->getText('mysqlNotSupported', Array('BACKENDID' => 
$this->backendId)));
+                       return FALSE;
                } else {
                        return TRUE;    
                }
diff --git a/nagvis/nagvis/includes/classes/GlobalLanguage.php 
b/nagvis/nagvis/includes/classes/GlobalLanguage.php
index 6a0d02c..cca8653 100644
--- a/nagvis/nagvis/includes/classes/GlobalLanguage.php
+++ b/nagvis/nagvis/includes/classes/GlobalLanguage.php
@@ -3,7 +3,7 @@
  *
  * GlobalLanguage.php - Class for handling languages in NagVis
  *
- * Copyright (c) 2004-2008 NagVis Project (Contact: [email protected])
+ * Copyright (c) 2004-2009 NagVis Project (Contact: [email protected])
  *
  * License:
  *
@@ -109,13 +109,8 @@ class GlobalLanguage {
         */
        private function checkGettextSupport() {
                if (!extension_loaded('gettext')) {
-                       dl('gettext.so');
-                       if (!extension_loaded('gettext')) {
-                               new GlobalFrontendMessage('ERROR', 
$this->getText('phpModuleNotLoaded','MODULE~gettext'), 
$this->MAINCFG->getValue('paths','htmlbase'));
-                               return FALSE;
-                       } else {
-                               return TRUE;
-                       }
+                       new GlobalFrontendMessage('ERROR', 
$this->getText('phpModuleNotLoaded','MODULE~gettext'), 
$this->MAINCFG->getValue('paths','htmlbase'));
+                       return FALSE;
                } else {
                        return TRUE;    
                }


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to