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

Author: Lars Michelsen <[email protected]>
Date:   Sun Jun 20 21:34:51 2010 +0200

#316 Removed last ereg calls

---

 share/server/core/classes/GlobalMainCfg.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/server/core/classes/GlobalMainCfg.php 
b/share/server/core/classes/GlobalMainCfg.php
index b52445b..73e73c2 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -1160,15 +1160,15 @@ class GlobalMainCfg {
                                        
                                        // loop given elements for checking: => 
all given attributes valid
                                        foreach($vars AS $key => $val) {
-                                               if(!ereg('^comment_',$key)) {
-                                                       if(ereg('^backend_', 
$type)) {
+                                               if(!preg_match('/^comment_/', 
$key)) {
+                                                       
if(preg_match('/^backend_/', $type)) {
                                                                
if(isset($this->validConfig['backend']['options'][$this->getValue($type,'backendtype')])
 
                                                                         && 
is_array($this->validConfig['backend']['options'][$this->getValue($type,'backendtype')]))
 {
                                                                        
$arrValidConfig = array_merge($this->validConfig['backend'], 
$this->validConfig['backend']['options'][$this->getValue($type,'backendtype')]);
                                                                } else {
                                                                        
$arrValidConfig = $this->validConfig['backend'];
                                                                }
-                                                       } 
elseif(ereg('^rotation_', $type)) {
+                                                       } 
elseif(preg_match('/^rotation_/', $type)) {
                                                                $arrValidConfig 
= $this->validConfig['rotation'];
                                                        } else {
                                                                $arrValidConfig 
= $this->validConfig[$type];
@@ -1188,7 +1188,7 @@ class GlobalMainCfg {
                                                                return FALSE;
                                                        } else {
                                                                // Workaround 
to get the configured string back
-                                                               
if(ereg('^rotation_', $type) && $key == 'maps') {
+                                                               
if(preg_match('/^rotation_/', $type) && $key == 'maps') {
                                                                        
foreach($val AS $intId => $arrStep) {
                                                                                
if(isset($arrStep['label']) && $arrStep['label'] != '') {
                                                                                
        $label = $arrStep['label'].':';


------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to