Changeset 5281
- Timestamp:
- 12/21/11 18:42:14 (12 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
-
calendar/inc/class.bocalendar.inc.php (modified) (3 diffs)
-
calendar/inc/class.socalendar_sql.inc.php (modified) (1 diff)
-
phpgwapi/inc/class.browser.inc.php (modified) (2 diffs)
-
phpgwapi/inc/class.error.inc.php (modified) (1 diff)
-
phpgwapi/inc/class.html.inc.php (modified) (1 diff)
-
phpgwapi/inc/class.sessions.inc.php (modified) (1 diff)
-
phpgwapi/inc/class.sessions_php4.inc.php (modified) (2 diffs)
-
phpgwapi/inc/functions.inc.php (modified) (2 diffs)
-
phpgwapi/templates/default/login_default.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.bocalendar.inc.php
r5132 r5281 192 192 $owner = get_var('owner',array('GET','POST'),$GLOBALS['owner']); 193 193 194 ereg('menuaction=([a-zA-Z.]+)',$_SERVER['HTTP_REFERER'],$regs);194 preg_match('/menuaction=([a-zA-Z.]+)/',$_SERVER['HTTP_REFERER'],$regs); 195 195 $from = $regs[1]; 196 196 if ((substr($_SERVER['PHP_SELF'],-8) == 'home.php' && substr($this->prefs['calendar']['defaultcalendar'],0,7) == 'planner' … … 3539 3539 3540 3540 3541 list($subject,$body1) = split("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);3541 list($subject,$body1) = preg_split('/\n/',$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2); 3542 3542 3543 3543 switch($part_prefs['calendar']['update_format']) … … 3791 3791 $details['startdate'] = $GLOBALS['phpgw']->common->show_date($starttime); 3792 3792 $details['enddate'] = $GLOBALS['phpgw']->common->show_date($endtime); 3793 list($subject,$body1) = split("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);3793 list($subject,$body1) = preg_split('/\n/',$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2); 3794 3794 } 3795 3795 -
trunk/calendar/inc/class.socalendar_sql.inc.php
r5243 r5281 794 794 function store_event() 795 795 { 796 return $this->save_event( &$this->event);796 return $this->save_event($this->event); 797 797 } 798 798 -
trunk/phpgwapi/inc/class.browser.inc.php
r5141 r5281 51 51 Determine browser and version 52 52 */ 53 if( ereg('MSIE ([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))53 if(preg_match('/MSIE ([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version)) 54 54 { 55 55 $this->BROWSER_VER = $log_version[1]; 56 56 $this->BROWSER_AGENT = 'IE'; 57 57 } 58 elseif( ereg('Opera ([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version) ||59 ereg('Opera/([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))58 elseif(preg_match('/Opera ([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version) || 59 preg_match('/Opera\/([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version)) 60 60 { 61 61 $this->BROWSER_VER = $log_version[1]; 62 62 $this->BROWSER_AGENT = 'OPERA'; 63 63 } 64 elseif( eregi('iCab ([0-9].[0-9a-zA-Z]{1,4})',$HTTP_USER_AGENT,$log_version) ||65 eregi('iCab/([0-9].[0-9a-zA-Z]{1,4})',$HTTP_USER_AGENT,$log_version))64 elseif(preg_match('/iCab ([0-9].[0-9a-zA-Z]{1,4})/i',$HTTP_USER_AGENT,$log_version) || 65 preg_match('/iCab\/([0-9].[0-9a-zA-Z]{1,4})/i',$HTTP_USER_AGENT,$log_version)) 66 66 { 67 67 $this->BROWSER_VER = $log_version[1]; 68 68 $this->BROWSER_AGENT = 'iCab'; 69 69 } 70 elseif( ereg('Gecko',$HTTP_USER_AGENT,$log_version))70 elseif(preg_match('/Gecko/',$HTTP_USER_AGENT,$log_version)) 71 71 { 72 72 if(isset($log_version[1])) … … 74 74 $this->BROWSER_AGENT = 'MOZILLA'; 75 75 } 76 elseif( ereg('Konqueror/([0-9].[0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version) ||77 ereg('Konqueror/([0-9].[0-9]{1,2})',$HTTP_USER_AGENT,$log_version))76 elseif(preg_match('/Konqueror\/([0-9].[0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version) || 77 preg_match('/Konqueror\/([0-9].[0-9]{1,2})/',$HTTP_USER_AGENT,$log_version)) 78 78 { 79 79 $this->BROWSER_VER=$log_version[1]; -
trunk/phpgwapi/inc/class.error.inc.php
r2 r5281 61 61 $fname = $parms['file']; 62 62 $line = $parms['line']; 63 if ( eregi('([DIWEF])-([[:alnum:]]*)\, (.*)',$etext,$match))63 if (preg_match('/([DIWEF])-([[:alnum:]]*)\, (.*)/i',$etext,$match)) 64 64 { 65 65 $this->severity = strtoupper($match[1]); -
trunk/phpgwapi/inc/class.html.inc.php
r2 r5281 22 22 { 23 23 // should be Ok for all HTML 4 compatible browsers 24 if (! eregi('(Safari)/([0-9.]+)',$_SERVER['HTTP_USER_AGENT'],$parts) &&25 ! eregi('compatible; ([a-z_]+)[/ ]+([0-9.]+)',$_SERVER['HTTP_USER_AGENT'],$parts))26 { 27 eregi('^([a-z_]+)/([0-9.]+)',$_SERVER['HTTP_USER_AGENT'],$parts);24 if (!preg_match('/(Safari)\/([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$parts) && 25 !preg_match('/compatible; ([a-z_]+)[\/ ]+([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$parts)) 26 { 27 preg_match('/^([a-z_]+)\/([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$parts); 28 28 } 29 29 list(,$this->user_agent,$this->ua_version) = $parts; -
trunk/phpgwapi/inc/class.sessions.inc.php
r5141 r5281 1177 1177 while ($i < count($a)) 1178 1178 { 1179 $b = split('=', $a[$i],2);1179 $b = preg_split('/=/', $a[$i],2); 1180 1180 // Check if this value doesn't already exist in new_extravars 1181 1181 if(array_key_exists($b[0], $new_extravars)) 1182 1182 { 1183 1183 // print "Debug::Error !!! " . $b[0] . " ($i) already exists<br>"; 1184 if( eregi("\[\]", $b[0]) )1184 if( preg_match('/\[\]/i', $b[0]) ) 1185 1185 { 1186 1186 $b[0] = eregi_replace("\[\]", "[$i]", $b[0]); -
trunk/phpgwapi/inc/class.sessions_php4.inc.php
r3018 r5281 97 97 $GLOBALS['phpgw_session']['session_action'] = $action; 98 98 99 session_register('phpgw_session');100 99 $_SESSION['phpgw_session'] = $GLOBALS['phpgw_session']; 101 100 … … 173 172 $encrypteddata = $GLOBALS['phpgw']->crypto->encrypt($data); 174 173 $GLOBALS['phpgw_session']['phpgw_app_sessions'][$appname][$location]['content'] = $encrypteddata; 175 session_register('phpgw_session');176 174 $_SESSION['phpgw_session'] = $GLOBALS['phpgw_session']; 177 175 return $data; -
trunk/phpgwapi/inc/functions.inc.php
r5164 r5281 101 101 } 102 102 103 magic_quotes_runtime(false);104 103 print_debug('sane environment','messageonly','api'); 105 104 … … 406 405 while ($phpgw_class_name = each($GLOBALS['phpgw_info']['flags'])) 407 406 { 408 if ( ereg('enable_',$phpgw_class_name[0]))407 if (preg_match('/enable_/',$phpgw_class_name[0])) 409 408 { 410 409 $enable_class = str_replace('enable_','',$phpgw_class_name[0]); -
trunk/phpgwapi/templates/default/login_default.php
r5164 r5281 364 364 foreach($_GET as $name => $value) 365 365 { 366 if( ereg('phpgw_',$name))366 if(preg_match('/phpgw_/',$name)) 367 367 { 368 368 $extra_vars .= '&' . $name . '=' . urlencode($value);
Note: See TracChangeset
for help on using the changeset viewer.
