diff -Naur WebCalendar-1.2.0.orig/ajax.php WebCalendar-1.2.0.new/ajax.php --- WebCalendar-1.2.0.orig/ajax.php 2007-09-17 04:39:21.000000000 +0200 +++ WebCalendar-1.2.0.new/ajax.php 2009-10-01 18:25:41.000000000 +0200 @@ -6,7 +6,7 @@ */ require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/translate.php'; include 'includes/config.php'; diff -Naur WebCalendar-1.2.0.orig/controlpanel.php WebCalendar-1.2.0.new/controlpanel.php --- WebCalendar-1.2.0.orig/controlpanel.php 2007-09-17 04:39:21.000000000 +0200 +++ WebCalendar-1.2.0.new/controlpanel.php 2009-10-01 18:26:27.000000000 +0200 @@ -23,7 +23,7 @@ require_once 'includes/classes/Event.class'; require_once 'includes/classes/RptEvent.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/translate.php'; include 'includes/config.php'; diff -Naur WebCalendar-1.2.0.orig/docdel.php WebCalendar-1.2.0.new/docdel.php --- WebCalendar-1.2.0.orig/docdel.php 2007-12-23 02:31:54.000000000 +0100 +++ WebCalendar-1.2.0.new/docdel.php 2009-10-01 18:17:05.000000000 +0200 @@ -32,7 +32,7 @@ $error = db_error (); else { if ( $row = dbi_fetch_row ( $res ) ) { - $doc =& new Doc ( $row ); + $doc = new Doc($row); $event_id = $doc->getEventId (); $name = $doc->getName (); $owner = $doc->getLogin (); diff -Naur WebCalendar-1.2.0.orig/doc.php WebCalendar-1.2.0.new/doc.php --- WebCalendar-1.2.0.orig/doc.php 2007-12-23 02:31:54.000000000 +0100 +++ WebCalendar-1.2.0.new/doc.php 2009-10-01 18:24:13.000000000 +0200 @@ -29,7 +29,7 @@ if ( ! $row ) $error = str_replace ( 'XXX', $blid, $invalidIDStr ); else { - $doc =& new Doc ( $row ); + $doc = new Doc($row); $description = $doc->getDescription (); $filedata = $doc->getData (); $filename = $doc->getName (); diff -Naur WebCalendar-1.2.0.orig/freebusy.php WebCalendar-1.2.0.new/freebusy.php --- WebCalendar-1.2.0.orig/freebusy.php 2007-12-23 02:31:54.000000000 +0100 +++ WebCalendar-1.2.0.new/freebusy.php 2009-10-01 18:18:18.000000000 +0200 @@ -46,7 +46,7 @@ require_once 'includes/classes/Event.class'; require_once 'includes/classes/RptEvent.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/config.php'; include 'includes/dbi4php.php'; diff -Naur WebCalendar-1.2.0.orig/icalclient.php WebCalendar-1.2.0.new/icalclient.php --- WebCalendar-1.2.0.orig/icalclient.php 2008-01-28 16:32:18.000000000 +0100 +++ WebCalendar-1.2.0.new/icalclient.php 2009-10-01 18:21:28.000000000 +0200 @@ -85,7 +85,7 @@ include_once 'includes/translate.php'; require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/config.php'; include 'includes/dbi4php.php'; diff -Naur WebCalendar-1.2.0.orig/includes/classes/phpmailer/class.phpmailer.php WebCalendar-1.2.0.new/includes/classes/phpmailer/class.phpmailer.php --- WebCalendar-1.2.0.orig/includes/classes/phpmailer/class.phpmailer.php 2007-08-06 04:28:33.000000000 +0200 +++ WebCalendar-1.2.0.new/includes/classes/phpmailer/class.phpmailer.php 2009-10-01 17:17:01.000000000 +0200 @@ -1087,12 +1087,18 @@ $this->SetError($this->Lang("file_open") . $path); return ""; } - $magic_quotes = get_magic_quotes_runtime (); - set_magic_quotes_runtime(0); + + if (function_exists('set_magic_quotes_runtime')) { + $magic_quotes = @get_magic_quotes_runtime(); + @set_magic_quotes_runtime(0); + } + $file_buffer = fread($fd, filesize($path)); $file_buffer = $this->EncodeString($file_buffer, $encoding); fclose($fd); - set_magic_quotes_runtime($magic_quotes); + + if (isset($magic_quotes)) + @set_magic_quotes_runtime($magic_quotes); return $file_buffer; } diff -Naur WebCalendar-1.2.0.orig/includes/functions.php WebCalendar-1.2.0.new/includes/functions.php --- WebCalendar-1.2.0.orig/includes/functions.php 2009-10-01 15:33:01.000000000 +0200 +++ WebCalendar-1.2.0.new/includes/functions.php 2009-10-01 18:27:59.000000000 +0200 @@ -45,9 +45,9 @@ * * @return string The text altered to have HTML links for any web links. */ -function activate_urls ( $text ) { - return ereg_replace ( '[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]', - '<a href="\\0">\\0</a>', $text ); +function activate_urls($text) { + return preg_replace('/[a-z]+:\/\/[^<> \t\r\n]+[a-z0-9\/]/i', + '<a href="\\0">\\0</a>', $text); } /* Adds something to the activity log for an event. @@ -2112,7 +2112,7 @@ } //end foreach bymonth } elseif ( count ( $byyearday ) ) { // end if isset bymonth foreach ( $byyearday as $yearday ) { - ereg ( '([-\+]{0,1})?([0-9]{1,3})', $yearday, $match ); + preg_match('/([-+]?)(\d{1,3})/', $yearday, $match); if ( $match[1] == '-' && ( $cdate >= $date ) ) $yret[] = mktime ( $hour, $minute, 0, 12, 31 - $match[2] - 1, $thisyear ); @@ -2970,11 +2970,11 @@ */ function get_web_browser () { $agent = getenv ( 'HTTP_USER_AGENT' ); - if ( ereg ( 'MSIE [0-9]', $agent ) ) + if (preg_match('/MSIE \d/', $agent)) return 'MSIE'; - if ( ereg ( 'Mozilla/[234]', $agent ) ) + if (preg_match('/Mozilla\/[234]/', $agent)) return 'Netscape'; - if ( ereg ( 'Mozilla/[5678]', $agent ) ) + if (preg_match('/Mozilla\/[5678]/', $agent)) return 'Mozilla'; return 'Unknown'; } @@ -5015,17 +5015,17 @@ } if ( $want_repeated && ! empty ( $row[20] ) ) // row[20] = cal_type - $item =& new RepeatingEvent ( $evt_name, $evt_descr, $row[2], $row[3], + $item = new RepeatingEvent($evt_name, $evt_descr, $row[2], $row[3], $row[4], $row[5], $row[6], $row[7], $row[8], $row[9], $row[10], $primary_cat, $row[11], $row[12], $row[13], $row[14], $row[15], $row[16], $row[17], $row[18], $row[19], $row[20], $row[21], $row[22], $row[23], $row[24], $row[25], $row[26], $row[27], $row[28], $row[29], - $row[30], $row[31], $row[32], array (), array (), array () ); + $row[30], $row[31], $row[32], array(), array(), array()); else - $item =& new Event ( $evt_name, $evt_descr, $row[2], $row[3], $row[4], + $item = new Event($evt_name, $evt_descr, $row[2], $row[3], $row[4], $row[5], $row[6], $row[7], $row[8], $row[9], $row[10], $primary_cat, $row[11], $row[12], $row[13], $row[14], $row[15], $row[16], $row[17], - $row[18], $row[19] ); + $row[18], $row[19]); if ( $item->getID () != $checkdup_id ) { $checkdup_id = $item->getID (); diff -Naur WebCalendar-1.2.0.orig/includes/gradient.php WebCalendar-1.2.0.new/includes/gradient.php --- WebCalendar-1.2.0.orig/includes/gradient.php 2007-09-13 04:29:28.000000000 +0200 +++ WebCalendar-1.2.0.new/includes/gradient.php 2009-10-06 14:40:54.000000000 +0200 @@ -136,7 +136,7 @@ { if ( $path { strlen ( $path ) - 1 } == '/' ) //Start function again with tmp file... return can_write_to_dir ( $path.uniqid ( mt_rand () ) . '.tmp'); - else if ( ereg ( '.tmp', $path ) ) { //Check tmp file for read/write capabilities + else if (preg_match('/\.tmp$/', $path)) { //Check tmp file for read/write capabilities if ( ! ( $f = @fopen ( $path, 'w+' ) ) ) return false; fclose ( $f ); diff -Naur WebCalendar-1.2.0.orig/includes/init.php WebCalendar-1.2.0.new/includes/init.php --- WebCalendar-1.2.0.orig/includes/init.php 2009-10-01 15:33:01.000000000 +0200 +++ WebCalendar-1.2.0.new/includes/init.php 2009-10-01 18:21:51.000000000 +0200 @@ -51,7 +51,7 @@ require_once 'includes/classes/Event.class'; require_once 'includes/classes/RptEvent.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include_once 'includes/assert.php'; include_once 'includes/config.php'; diff -Naur WebCalendar-1.2.0.orig/includes/translate.php WebCalendar-1.2.0.new/includes/translate.php --- WebCalendar-1.2.0.orig/includes/translate.php 2008-09-27 16:49:14.000000000 +0200 +++ WebCalendar-1.2.0.new/includes/translate.php 2009-10-01 17:14:07.000000000 +0200 @@ -67,7 +67,8 @@ if ( strlen ( $buffer ) == 0 ) continue; - if ( get_magic_quotes_runtime () && $strip ) + if (function_exists('get_magic_quotes_runtime') && + @get_magic_quotes_runtime() && $strip) $buffer = stripslashes ( $buffer ); // Convert quotes to entities. @@ -266,7 +267,7 @@ else { $langs = explode ( ',', $HTTP_ACCEPT_LANGUAGE ); for ( $i = 0, $cnt = count ( $langs ); $i < $cnt; $i++ ) { - $l = strtolower ( trim ( ereg_replace ( ';.*', '', $langs[$i] ) ) ); + $l = strtolower(trim(preg_replace('/;.*/', '', $langs[$i]))); $ret .= "\"$l\" "; if ( ! empty ( $browser_languages[$l] ) ) return $browser_languages[$l]; @@ -337,10 +338,10 @@ * @param string $str Text to translate * @return string The translated text with all HTML removed */ -function tooltip ( $str, $decode = '' ) { - $ret = translate ( $str, $decode ); - $ret = eregi_replace ( '<[^>]+>', '', $ret ); - return eregi_replace ( '"', "'", $ret ); +function tooltip($str, $decode = '') { + $ret = translate($str, $decode); + $ret = preg_replace('/<[^>]+>/', '', $ret); + return preg_replace('/"/', "'", $ret); } /* Translates and removes HTML from text, and prints it. diff -Naur WebCalendar-1.2.0.orig/includes/user-app-postnuke.php WebCalendar-1.2.0.new/includes/user-app-postnuke.php --- WebCalendar-1.2.0.orig/includes/user-app-postnuke.php 2007-08-17 16:39:00.000000000 +0200 +++ WebCalendar-1.2.0.new/includes/user-app-postnuke.php 2009-10-01 16:43:15.000000000 +0200 @@ -239,7 +239,7 @@ $res = dbi_query ( $sql ); if ( $res ) { while ( $row = dbi_fetch_row ( $res ) ) { - list ( $fname, $lname ) = split ( ' ',$row[1] ); + list($fname, $lname) = explode(' ', $row[1]); $ret[$count++] = array ( 'cal_login' => $row[2], 'cal_lastname' => $lname, @@ -290,7 +290,7 @@ $res = dbi_query ( $sql ); if ( $res ) { if ( $row = dbi_fetch_row ( $res ) ) { - list ( $fname, $lname ) = split ( ' ',$row[1] ); + list($fname, $lname) = explode(' ', $row[1]); $GLOBALS[$prefix . 'login'] = $login; $GLOBALS[$prefix . 'firstname'] = $fname; $GLOBALS[$prefix . 'lastname'] = $lname; @@ -490,4 +490,4 @@ global $error; $error = 'User admin not supported.'; return false; } -?> \ No newline at end of file +?> diff -Naur WebCalendar-1.2.0.orig/includes/user-ldap.php WebCalendar-1.2.0.new/includes/user-ldap.php --- WebCalendar-1.2.0.orig/includes/user-ldap.php 2007-08-17 16:39:00.000000000 +0200 +++ WebCalendar-1.2.0.new/includes/user-ldap.php 2009-10-01 16:44:24.000000000 +0200 @@ -504,9 +504,9 @@ // // ex: stripdn(uid=jeffh,ou=people,dc=example,dc=com) returns jeffh function stripdn($dn){ - list ($uid,$trash) = split (',', $dn, 2); - list ($trash,$user) = split ('=', $uid); - return($user); + list($uid, $trash) = explode(',', $dn, 2); + list($trash, $user) = explode('=', $uid); + return $user; } // Connects and binds to the LDAP server diff -Naur WebCalendar-1.2.0.orig/install/index.php WebCalendar-1.2.0.new/install/index.php --- WebCalendar-1.2.0.orig/install/index.php 2009-10-01 15:33:01.000000000 +0200 +++ WebCalendar-1.2.0.new/install/index.php 2009-10-01 17:08:11.000000000 +0200 @@ -109,8 +109,13 @@ // First pass at settings.php. // We need to read it first in order to get the md5 password. -$magic = @get_magic_quotes_runtime (); -@set_magic_quotes_runtime (0); +if (function_exists('set_magic_quotes_runtime')) { + $magic = @get_magic_quotes_runtime(); + @set_magic_quotes_runtime(0); + } +else + unset($magic); + $fd = @fopen ( $file, 'rb', true ); $settings = array (); $password = ''; @@ -132,7 +137,9 @@ $forcePassword = true; } } -@set_magic_quotes_runtime ($magic); + +if (isset($magic)) + @set_magic_quotes_runtime($magic); session_start (); $doLogin = false; @@ -251,8 +258,13 @@ exit; } -$magic = @get_magic_quotes_runtime (); -@set_magic_quotes_runtime (0); +if (function_exists('set_magic_quotes_runtime')) { + $magic = @get_magic_quotes_runtime(); + @set_magic_quotes_runtime(0); + } +else + unset($magic); + $fd = @fopen ( $file, 'rb', false ); if ( ! empty ( $fd ) ) { while ( ! feof ( $fd ) ) { @@ -270,7 +282,9 @@ } fclose ( $fd ); } -@set_magic_quotes_runtime ($magic); + +if (isset($magic)) + @set_magic_quotes_runtime($magic); $action = getGetValue ( 'action' ); // We were set here because of a mismatch of $PROGRAM_VERSION diff -Naur WebCalendar-1.2.0.orig/install/install_functions.php WebCalendar-1.2.0.new/install/install_functions.php --- WebCalendar-1.2.0.orig/install/install_functions.php 2007-08-06 04:28:33.000000000 +0200 +++ WebCalendar-1.2.0.new/install/install_functions.php 2009-10-01 17:10:39.000000000 +0200 @@ -454,8 +454,12 @@ $current_pointer = false; $full_sql = ''; - $magic = @get_magic_quotes_runtime (); - @set_magic_quotes_runtime ( 0 ); + + if (function_exists('set_magic_quotes_runtime')) { + $magic = @get_magic_quotes_runtime(); + @set_magic_quotes_runtime(0); + } + $fd = @fopen ( 'sql/' . $install_filename, 'r', true ); // Discard everything up to the required point in the upgrade file. @@ -483,7 +487,9 @@ $full_sql .= $data; } - @set_magic_quotes_runtime ( $magic ); + if (isset($magic)) + @set_magic_quotes_runtime($magic); + fclose ( $fd ); $parsed_sql = parse_sql ( $full_sql ); diff -Naur WebCalendar-1.2.0.orig/login-app.php WebCalendar-1.2.0.new/login-app.php --- WebCalendar-1.2.0.orig/login-app.php 2007-09-17 04:39:21.000000000 +0200 +++ WebCalendar-1.2.0.new/login-app.php 2009-10-01 18:23:48.000000000 +0200 @@ -2,7 +2,7 @@ /* $Id: login-app.php,v 1.24.2.1 2007/09/17 02:39:21 cknudsen Exp $ */ require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/translate.php'; include 'includes/config.php'; diff -Naur WebCalendar-1.2.0.orig/login.php WebCalendar-1.2.0.new/login.php --- WebCalendar-1.2.0.orig/login.php 2008-07-02 02:49:02.000000000 +0200 +++ WebCalendar-1.2.0.new/login.php 2009-10-01 18:19:39.000000000 +0200 @@ -15,7 +15,7 @@ require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/translate.php'; include 'includes/config.php'; diff -Naur WebCalendar-1.2.0.orig/nulogin.php WebCalendar-1.2.0.new/nulogin.php --- WebCalendar-1.2.0.orig/nulogin.php 2007-12-23 02:31:55.000000000 +0100 +++ WebCalendar-1.2.0.new/nulogin.php 2009-10-01 18:20:15.000000000 +0200 @@ -5,7 +5,7 @@ */ require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/translate.php'; include 'includes/config.php'; diff -Naur WebCalendar-1.2.0.orig/publish.php WebCalendar-1.2.0.new/publish.php --- WebCalendar-1.2.0.orig/publish.php 2007-12-23 02:31:55.000000000 +0100 +++ WebCalendar-1.2.0.new/publish.php 2009-10-01 18:17:32.000000000 +0200 @@ -26,7 +26,7 @@ require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/translate.php'; include 'includes/config.php'; diff -Naur WebCalendar-1.2.0.orig/register.php WebCalendar-1.2.0.new/register.php --- WebCalendar-1.2.0.orig/register.php 2007-12-23 02:31:55.000000000 +0100 +++ WebCalendar-1.2.0.new/register.php 2009-10-01 18:23:24.000000000 +0200 @@ -2,7 +2,7 @@ /* $Id: register.php,v 1.36.2.4 2007/11/12 15:44:55 umcesrjones Exp $ */ require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/translate.php'; include 'includes/config.php'; @@ -28,7 +28,7 @@ $WebCalendar->setLanguage (); require ( 'includes/classes/WebCalMailer.class' ); -$mail = &new WebCalMailer; +$mail = new WebCalMailer; $appStr = generate_application_name (); diff -Naur WebCalendar-1.2.0.orig/rss_activity_log.php WebCalendar-1.2.0.new/rss_activity_log.php --- WebCalendar-1.2.0.orig/rss_activity_log.php 2008-03-07 19:22:44.000000000 +0100 +++ WebCalendar-1.2.0.new/rss_activity_log.php 2009-10-01 18:17:48.000000000 +0200 @@ -37,7 +37,7 @@ include_once 'includes/translate.php'; require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/config.php'; include 'includes/dbi4php.php'; diff -Naur WebCalendar-1.2.0.orig/rss.php WebCalendar-1.2.0.new/rss.php --- WebCalendar-1.2.0.orig/rss.php 2008-07-02 02:49:02.000000000 +0200 +++ WebCalendar-1.2.0.new/rss.php 2009-10-01 18:22:52.000000000 +0200 @@ -58,7 +58,7 @@ require_once 'includes/classes/Event.class'; require_once 'includes/classes/RptEvent.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/formvars.php'; include 'includes/functions.php'; diff -Naur WebCalendar-1.2.0.orig/rss_unapproved.php WebCalendar-1.2.0.new/rss_unapproved.php --- WebCalendar-1.2.0.orig/rss_unapproved.php 2008-03-07 19:22:44.000000000 +0100 +++ WebCalendar-1.2.0.new/rss_unapproved.php 2009-10-01 18:18:41.000000000 +0200 @@ -36,7 +36,7 @@ include_once 'includes/translate.php'; require_once 'includes/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/config.php'; include 'includes/dbi4php.php'; diff -Naur WebCalendar-1.2.0.orig/tests/all_tests.php WebCalendar-1.2.0.new/tests/all_tests.php --- WebCalendar-1.2.0.orig/tests/all_tests.php 2007-02-04 03:50:19.000000000 +0100 +++ WebCalendar-1.2.0.new/tests/all_tests.php 2009-10-01 18:19:09.000000000 +0200 @@ -7,7 +7,7 @@ require_once ( SIMPLETEST_ROOT . 'unit_tester.php' ); require_once ( SIMPLETEST_ROOT . 'reporter.php' ); -$test =& new GroupTest ( 'All tests' ); +$test = new GroupTest('All tests'); $test->addTestFile ( 'add_duration_test.php' ); $test->run ( new HtmlReporter () ); diff -Naur WebCalendar-1.2.0.orig/tools/convert_passwords.php WebCalendar-1.2.0.new/tools/convert_passwords.php --- WebCalendar-1.2.0.orig/tools/convert_passwords.php 2009-10-01 15:33:01.000000000 +0200 +++ WebCalendar-1.2.0.new/tools/convert_passwords.php 2009-10-01 18:25:20.000000000 +0200 @@ -21,7 +21,7 @@ require_once __WC_INCLUDEDIR . '/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include __WC_INCLUDEDIR . '/config.php'; include __WC_INCLUDEDIR . '/dbi4php.php'; diff -Naur WebCalendar-1.2.0.orig/tools/reload_remotes.php WebCalendar-1.2.0.new/tools/reload_remotes.php --- WebCalendar-1.2.0.orig/tools/reload_remotes.php 2007-12-23 02:32:02.000000000 +0100 +++ WebCalendar-1.2.0.new/tools/reload_remotes.php 2009-10-01 18:24:58.000000000 +0200 @@ -50,7 +50,7 @@ require_once __WC_INCLUDEDIR . '/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include __WC_INCLUDEDIR . '/translate.php'; include __WC_INCLUDEDIR . '/config.php'; diff -Naur WebCalendar-1.2.0.orig/tools/send_reminders.php WebCalendar-1.2.0.new/tools/send_reminders.php --- WebCalendar-1.2.0.orig/tools/send_reminders.php 2009-10-01 15:33:01.000000000 +0200 +++ WebCalendar-1.2.0.new/tools/send_reminders.php 2009-10-01 18:24:37.000000000 +0200 @@ -61,7 +61,7 @@ require_once __WC_INCLUDEDIR . '/classes/RptEvent.class'; require_once __WC_INCLUDEDIR . '/classes/WebCalMailer.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include __WC_INCLUDEDIR . '/translate.php'; include __WC_INCLUDEDIR . '/config.php'; diff -Naur WebCalendar-1.2.0.orig/upcoming.php WebCalendar-1.2.0.new/upcoming.php --- WebCalendar-1.2.0.orig/upcoming.php 2008-07-02 02:49:02.000000000 +0200 +++ WebCalendar-1.2.0.new/upcoming.php 2009-10-01 18:26:53.000000000 +0200 @@ -87,7 +87,7 @@ require_once 'includes/classes/Event.class'; require_once 'includes/classes/RptEvent.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include 'includes/config.php'; include 'includes/dbi4php.php'; diff -Naur WebCalendar-1.2.0.orig/usersel.php WebCalendar-1.2.0.new/usersel.php --- WebCalendar-1.2.0.orig/usersel.php 2007-08-06 04:28:31.000000000 +0200 +++ WebCalendar-1.2.0.new/usersel.php 2009-10-01 16:44:40.000000000 +0200 @@ -18,7 +18,7 @@ } // Parse $users. -$exp = split ( ',', $users ); +$exp = explode(',', $users); $groups = $selected = $sql_params = array (); for ( $i = 0, $cnt = count ( $exp ); $i < $cnt; $i++ ) { $selected[$exp[$i]] = 1; diff -Naur WebCalendar-1.2.0.orig/view_entry.php WebCalendar-1.2.0.new/view_entry.php --- WebCalendar-1.2.0.orig/view_entry.php 2009-10-01 15:33:01.000000000 +0200 +++ WebCalendar-1.2.0.new/view_entry.php 2009-10-01 18:26:08.000000000 +0200 @@ -814,7 +814,7 @@ <td class="aligntop bold">' . translate ( 'Attachments' ) . ':</td> <td>'; - $attList =& new AttachmentList ( $id ); + $attList = new AttachmentList($id); for ( $i = 0; $i < $attList->getSize (); $i++ ) { $a = $attList->getDoc ( $i ); echo ' @@ -842,7 +842,7 @@ <td class="aligntop bold">' . translate ( 'Comments' ) . ':</td> <td>'; - $comList =& new CommentList ( $id ); + $comList = new CommentList($id); $num_comment = $comList->getSize (); $comment_text = ''; for ( $i = 0; $i < $num_comment; $i++ ) { diff -Naur WebCalendar-1.2.0.orig/ws/login.php WebCalendar-1.2.0.new/ws/login.php --- WebCalendar-1.2.0.orig/ws/login.php 2007-12-23 02:32:04.000000000 +0100 +++ WebCalendar-1.2.0.new/ws/login.php 2009-10-01 18:20:56.000000000 +0200 @@ -12,7 +12,7 @@ include __WC_INCLUDEDIR . '/translate.php'; require_once __WC_INCLUDEDIR . '/classes/WebCalendar.class'; -$WebCalendar =& new WebCalendar ( __FILE__ ); +$WebCalendar = new WebCalendar(__FILE__); include __WC_INCLUDEDIR . '/config.php'; include __WC_INCLUDEDIR . '/dbi4php.php'; diff -Naur WebCalendar-1.2.0.orig/ws/ws.php WebCalendar-1.2.0.new/ws/ws.php --- WebCalendar-1.2.0.orig/ws/ws.php 2007-12-23 02:32:04.000000000 +0100 +++ WebCalendar-1.2.0.new/ws/ws.php 2009-10-01 18:20:34.000000000 +0200 @@ -24,7 +24,7 @@ require_once __WC_INCLUDEDIR . '/classes/Event.class'; require_once __WC_INCLUDEDIR . '/classes/RptEvent.class'; - $WebCalendar =& new WebCalendar ( __FILE__ ); + $WebCalendar = new WebCalendar(__FILE__); include_once __WC_INCLUDEDIR . '/config.php'; include_once __WC_INCLUDEDIR . '/dbi4php.php';