rpms/WebCalendar/F-12 WebCalendar-1.2.0-daylightbug.patch, NONE, 1.1 WebCalendar-1.2.0-php53.patch, NONE, 1.1 WebCalendar-1.2.0-viewothers.patch, NONE, 1.1 WebCalendar-1.2.1-usercase.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 WebCalendar.spec, 1.1, 1.2 sources, 1.2, 1.3 WebCalendar-1.2.0-nolangwarn.patch, 1.1, NONE WebCalendar-1.2.0-shebang.patch, 1.1, NONE WebCalendar-1.2.0-usercase.patch, 1.1, NONE WebCalendar-1.2.0-weektimebar.patch, 1.1, NONE
Patrick Monnerat
monnerat at fedoraproject.org
Thu Jul 8 14:19:59 UTC 2010
Author: monnerat
Update of /cvs/pkgs/rpms/WebCalendar/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21814
Modified Files:
.cvsignore WebCalendar.spec sources
Added Files:
WebCalendar-1.2.0-daylightbug.patch
WebCalendar-1.2.0-php53.patch
WebCalendar-1.2.0-viewothers.patch
WebCalendar-1.2.1-usercase.patch
Removed Files:
WebCalendar-1.2.0-nolangwarn.patch
WebCalendar-1.2.0-shebang.patch
WebCalendar-1.2.0-usercase.patch
WebCalendar-1.2.0-weektimebar.patch
Log Message:
* Thu Jul 8 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.1-1
- New upstream version.
- Patch "php53" to get rid of PHP 5.3 deprecated features.
https://sourceforge.net/tracker/?func=detail&aid=2873491&group_id=3870&atid=303870
- Patch "daylightbug" to fix day offset by one when crossing daylight saving
active/inactive date.
https://sourceforge.net/tracker/?func=detail&aid=2877076&group_id=3870&atid=303870
- Patch "viewothers" to allow viewing other users calendar when access control
is off.
https://sourceforge.net/tracker/?func=detail&aid=2880387&group_id=3870&atid=303870
- Include AUTHORS in product directory too: needed by the "about" box.
WebCalendar-1.2.0-daylightbug.patch:
includes/functions.php | 23 +++++++++++++++++++++++
includes/init.php | 4 ++--
view_v.php | 11 ++++++-----
3 files changed, 31 insertions(+), 7 deletions(-)
--- NEW FILE WebCalendar-1.2.0-daylightbug.patch ---
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-12 15:32:31.000000000 +0200
+++ WebCalendar-1.2.0.new/includes/functions.php 2009-10-12 15:50:35.000000000 +0200
@@ -139,6 +139,29 @@
return sprintf ( "%d%02d00", $minutes / 60, $minutes % 60 );
}
+/* Bump UNIX local timestamp with the given duration.
+ * param int $ts input timestamp
+ * param int $hour hour duration
+ * param int $minute minute duration
+ * param int $second second duration
+ * param int $month month duration
+ * param int $day day duration
+ * param int $year year duration
+ *
+ * This function overcomes problems due to daylight saving change dates;
+ * it is based on the fact that function mktime() accepts out of range
+ * data.
+ */
+
+function bump_local_timestamp($ts, $hour = 0, $minute = 0, $second = 0,
+ $month = 0, $day = 0, $year = 0)
+
+{
+ return mktime(date('G', $ts) + $hour, date('i', $ts) + $minute,
+ date('s', $ts) + $second, date('n', $ts) + $month,
+ date('j', $ts) + $day, date('Y', $ts) + $year);
+}
+
/* Builds the HTML for the event label.
*
* @param string $can_access
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-12 15:32:31.000000000 +0200
+++ WebCalendar-1.2.0.new/includes/init.php 2009-10-12 15:55:43.000000000 +0200
@@ -411,8 +411,8 @@
$wkstart = get_weekday_before ( $y, $m, $d );
$lastDay = ( $DISPLAY_WEEKENDS == 'N' ? 4 : 6 );
for ( $i = -5; $i <= 9; $i++ ) {
- $twkstart = $wkstart + ( 604800 * $i );
- $twkend = $twkstart + ( 86400 * $lastDay );
+ $twkstart = bump_local_timestamp($wkstart, 0, 0, 0, 0, 7 * $i, 0);
+ $twkend = bump_local_timestamp($twkstart, 0, 0, 0, 0, $lastDay, 0);
$dateSYmd = date ( 'Ymd', $twkstart );
$dateEYmd = date ( 'Ymd', $twkend );
$dateW = date ( 'W', $twkstart + 86400 );
diff -Naur WebCalendar-1.2.0.orig/view_v.php WebCalendar-1.2.0.new/view_v.php
--- WebCalendar-1.2.0.orig/view_v.php 2008-03-07 21:15:45.000000000 +0100
+++ WebCalendar-1.2.0.new/view_v.php 2009-10-12 16:04:55.000000000 +0200
@@ -34,10 +34,10 @@
$nextdate = date ( 'Ymd', mktime ( 0, 0, 0, $thismonth, $thisday + 7, $thisyear ) );
$prevdate = date ( 'Ymd', mktime ( 0, 0, 0, $thismonth, $thisday - 7, $thisyear ) );
-$wkstart = get_weekday_before ( $thisyear, $thismonth, $thisday + 1 );
-
-$wkend = $wkstart + ( 86400 * ( $DISPLAY_WEEKENDS == 'N' ? 5 : 7 ) );
-$thisdate = date ( 'Ymd', $wkstart );
+$wkstart = get_weekday_before($thisyear, $thismonth, $thisday + 1);
+$wkend = bump_local_timestamp($wkstart, 0, 0, 0, 0,
+ $DISPLAY_WEEKENDS == 'N'? 5: 7, 0) - 1;
+$thisdate = date('Ymd', $wkstart);
$nextStr = translate ( 'Next' );
$prevStr = translate ( 'Previous' );
@@ -108,7 +108,8 @@
$body .= '
<tr>
<th class="row" style="width:' . $tdw . '%;">' . $tempfullname . '</th>';
- for ( $date = $wkstart; $date < $wkend; $date += 86400 ) {
+ for ($date = $wkstart; $date <= $wkend;
+ $date = bump_local_timestamp($date, 0, 0, 0, 0, 1, 0)) {
$is_weekend = is_weekend ( $date );
if ( $is_weekend && $DISPLAY_WEEKENDS == 'N' )
continue;
WebCalendar-1.2.0-php53.patch:
ajax.php | 2 -
controlpanel.php | 2 -
doc.php | 2 -
docdel.php | 2 -
freebusy.php | 2 -
icalclient.php | 2 -
includes/classes/phpmailer/class.phpmailer.php | 12 ++++++++---
includes/functions.php | 22 ++++++++++-----------
includes/gradient.php | 2 -
includes/init.php | 2 -
includes/translate.php | 13 ++++++------
includes/user-app-postnuke.php | 6 ++---
includes/user-ldap.php | 6 ++---
install/index.php | 26 +++++++++++++++++++------
install/install_functions.php | 12 ++++++++---
login-app.php | 2 -
login.php | 2 -
nulogin.php | 2 -
publish.php | 2 -
register.php | 4 +--
rss.php | 2 -
rss_activity_log.php | 2 -
rss_unapproved.php | 2 -
tests/all_tests.php | 2 -
tools/convert_passwords.php | 2 -
tools/reload_remotes.php | 2 -
tools/send_reminders.php | 2 -
upcoming.php | 2 -
usersel.php | 2 -
view_entry.php | 4 +--
ws/login.php | 2 -
ws/ws.php | 2 -
32 files changed, 89 insertions(+), 62 deletions(-)
--- NEW FILE WebCalendar-1.2.0-php53.patch ---
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 ();
- at 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;
}
}
- at 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 ();
- at 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 );
}
- at 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';
WebCalendar-1.2.0-viewothers.patch:
access.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--- NEW FILE WebCalendar-1.2.0-viewothers.patch ---
diff -Naur WebCalendar-1.2.0.orig/includes/access.php WebCalendar-1.2.0.new/includes/access.php
--- WebCalendar-1.2.0.orig/includes/access.php 2008-07-02 02:49:02.000000000 +0200
+++ WebCalendar-1.2.0.new/includes/access.php 2009-10-16 11:24:07.000000000 +0200
@@ -478,7 +478,7 @@
function access_user_calendar ( $cal_can_xxx = '', $other_user, $cur_user = '',
$type = '', $access = '' ) {
- global $access_other_cals, $access_users, $login, $ADMIN_OVERRIDE_UAC, $is_admin;
+ global $access_other_cals, $access_users, $login, $ADMIN_OVERRIDE_UAC, $is_admin, $ALLOW_VIEW_OTHER;
$admin_override = ( $is_admin && !
empty ( $ADMIN_OVERRIDE_UAC ) && $ADMIN_OVERRIDE_UAC == 'Y' );
@@ -502,6 +502,14 @@
assert ( '! empty ( $other_user )' );
assert ( '! empty ( $cur_user )' );
+
+ if (!access_is_enabled()) {
+ if (!empty($ALLOW_VIEW_OTHER) && $cur_user != '__public__' &&
+ $cal_can_xxx == 'view' && $ALLOW_VIEW_OTHER == 'Y')
+ return 'Y';
+
+ return 'N';
+ }
if ( empty ( $access_other_cals ) )
access_load_user_permissions ();
WebCalendar-1.2.1-usercase.patch:
includes/classes/WebCalendar.class | 16 ++++++++++++----
includes/config.php | 12 +++++++++---
includes/settings.php.orig | 5 +++++
install/index.php | 14 ++++++++++++++
tools/send_reminders.php | 13 +++++++++++--
translations/English-US.txt | 1 +
translations/French.txt | 1 +
7 files changed, 53 insertions(+), 9 deletions(-)
--- NEW FILE WebCalendar-1.2.1-usercase.patch ---
diff -Naur WebCalendar-1.2.1.orig/includes/classes/WebCalendar.class WebCalendar-1.2.1.new/includes/classes/WebCalendar.class
--- WebCalendar-1.2.1.orig/includes/classes/WebCalendar.class 2010-05-07 19:24:50.000000000 +0200
+++ WebCalendar-1.2.1.new/includes/classes/WebCalendar.class 2010-05-07 19:27:24.000000000 +0200
@@ -143,7 +143,8 @@
*/
function _initInitSecondPhase () {
global $ALLOW_VIEW_OTHER, $can_add, $can_add, $cat_id, $CATEGORIES_ENABLED,
- $CATEGORY_VIEW, $caturl, $date, $DMW, $friendly, $override, $fullname, $GROUPS_ENABLED,
+ $CATEGORY_VIEW, $caturl, $date, $DMW, $friendly, $ignore_user_case,
+ $override, $fullname, $GROUPS_ENABLED,
$hour, $id, $is_admin, $is_assistant, $is_nonuser, $login, $minute, $month,
$NONUSER_ENABLED, $nonusers, $ovrd, $PUBLIC_ACCESS, $PUBLIC_ACCESS_CAN_ADD,
$PUBLIC_ACCESS_FULLNAME, $PUBLIC_ACCESS_OTHERS, $readonly, $u_url, $user,
@@ -170,6 +171,9 @@
if ( empty ( $PUBLIC_ACCESS ) )
$PUBLIC_ACCESS = 'N';
+ if ($ignore_user_case)
+ $user = strtolower($user);
+
// Initialize access settings ($user_access string)
// and make sure user is allowed to view the current page.
access_init ();
@@ -425,9 +429,9 @@
*/
function _initValidate () {
global $c, $cryptpw, $db_database, $db_host, $db_login, $db_password,
- $encoded_login, $HTTP_ENV_VARS, $HTTP_SERVER_VARS, $is_nonuser, $login,
- $login_return_path, $PHP_AUTH_USER, $REMOTE_USER, $SCRIPT,
- $session_not_found, $settings, $single_user, $single_user_login,
+ $encoded_login, $HTTP_ENV_VARS, $HTTP_SERVER_VARS, $ignore_user_case,
+ $is_nonuser, $login, $login_return_path, $PHP_AUTH_USER, $REMOTE_USER,
+ $SCRIPT, $session_not_found, $settings, $single_user, $single_user_login,
$use_http_auth, $user_inc, $validate_redirect, $webcalendar_session;
/* If WebCalendar is configured to use http authentication, then we can
@@ -571,6 +575,10 @@
}
}
}
+
+ // If login is not case-sensitive, map it to lowercase now.
+ if ($ignore_user_case)
+ $login = strtolower($login);
}
/* Initializations from includes/connect.php.
diff -Naur WebCalendar-1.2.1.orig/includes/config.php WebCalendar-1.2.1.new/includes/config.php
--- WebCalendar-1.2.1.orig/includes/config.php 2010-04-09 15:47:49.000000000 +0200
+++ WebCalendar-1.2.1.new/includes/config.php 2010-05-07 19:27:24.000000000 +0200
@@ -92,9 +92,10 @@
function do_config ( $fileLoc ) {
global $db_database, $db_host, $db_login, $db_password, $db_persistent,
- $db_type, $NONUSER_PREFIX, $phpdbiVerbose, $PROGRAM_DATE, $PROGRAM_NAME,
- $PROGRAM_URL, $PROGRAM_VERSION, $readonly, $run_mode, $settings, $single_user,
- $single_user_login, $TROUBLE_URL, $use_http_auth, $user_inc;
+ $db_type, $ignore_user_case, $NONUSER_PREFIX, $phpdbiVerbose, $PROGRAM_DATE,
+ $PROGRAM_NAME, $PROGRAM_URL, $PROGRAM_VERSION, $readonly, $run_mode,
+ $settings, $single_user, $single_user_login, $TROUBLE_URL, $use_http_auth,
+ $user_inc;
$PROGRAM_VERSION = 'v1.2.1';
$PROGRAM_DATE = '09 Apr 2010';
@@ -220,6 +221,11 @@
$use_http_auth = ( preg_match ( '/(1|yes|true|on)/i',
$settings['use_http_auth'] ) ? true : false );
+ // Whether user name is case-insensitive.
+ $ignore_user_case = isset($settings['ignore_user_case'])?
+ preg_match("/(1|yes|true|on)/i", $settings['ignore_user_case'])?
+ true: false: false;
+
// Type of user authentication.
$user_inc = $settings['user_inc'];
diff -Naur WebCalendar-1.2.1.orig/includes/settings.php.orig WebCalendar-1.2.1.new/includes/settings.php.orig
--- WebCalendar-1.2.1.orig/includes/settings.php.orig 2010-04-06 16:29:09.000000000 +0200
+++ WebCalendar-1.2.1.new/includes/settings.php.orig 2010-05-07 19:27:24.000000000 +0200
@@ -71,5 +71,10 @@
# need to modify user-ldap.php to configure some settings.
user_inc: user.php
+# Set the following to true if the user name authentication is not
+# case-sensitive. This results in translating all authenticated user names
+# to lowercase.
+ignore_user_case: false
+
# end */
?>
diff -Naur WebCalendar-1.2.1.orig/install/index.php WebCalendar-1.2.1.new/install/index.php
--- WebCalendar-1.2.1.orig/install/index.php 2010-05-07 19:24:50.000000000 +0200
+++ WebCalendar-1.2.1.new/install/index.php 2010-05-07 19:27:24.000000000 +0200
@@ -660,6 +660,7 @@
$settings['install_password'] = '';
$settings['single_user_login'] = '';
$settings['use_http_auth'] = 'false';
+ $settings['ignore_user_case'] = 'false';
$settings['single_user'] = 'false';
}
} else {
@@ -686,6 +687,7 @@
$y = getPostValue ( 'app_settings' );
if ( ! empty ( $y ) ) {
$settings['single_user_login'] = getPostValue ( 'form_single_user_login' );
+ $settings['ignore_user_case'] = getPostValue ( 'form_ignore_user_case' );
$settings['readonly'] = getPostValue ( 'form_readonly' );
$settings['mode'] = getPostValue ( 'form_mode' );
if ( getPostValue ( 'form_user_inc' ) == 'http' ) {
@@ -835,8 +837,10 @@
}
if ( form.form_user_inc.options[listid].selected ) {
makeVisible ( "singleuser" );
+ makeInvisible ( "usercase" );
} else {
makeInvisible ( "singleuser" );
+ makeVisible ( "usercase" );
}
}
@@ -1495,6 +1499,16 @@
<td>
<input name="form_single_user_login" size="20" value="<?php echo ( empty ( $settings['single_user_login'] ) ? '' : $settings['single_user_login'] );?>" /></td>
</tr>
+ <tr id="usercase">
+ <td class="prompt"><?php etranslate ( 'Case-insensitive user name' ) ?>:</td>
+ <td>
+ <input name="form_ignore_user_case" value="true" type="radio"
+ <?php echo ( $settings['ignore_user_case'] == 'true' )? $checked : '';?> /><?php etranslate ( 'Yes' ) ?>
+
+ <input name="form_ignore_user_case" value="false" type="radio"
+ <?php echo ( $settings['ignore_user_case'] != 'true' )? $checked : '';?> /><?php etranslate ( 'No' ) ?>
+ </td>
+ </tr>
<tr>
<td class="prompt"><?php etranslate ( 'Read-Only' ) ?>:</td>
<td>
diff -Naur WebCalendar-1.2.1.orig/tools/send_reminders.php WebCalendar-1.2.1.new/tools/send_reminders.php
--- WebCalendar-1.2.1.orig/tools/send_reminders.php 2010-05-07 19:24:50.000000000 +0200
+++ WebCalendar-1.2.1.new/tools/send_reminders.php 2010-05-07 19:27:24.000000000 +0200
@@ -103,6 +103,10 @@
for ( $i = 0; $i < $allusercnt; $i++ ) {
$names[$allusers[$i]['cal_login']] = $allusers[$i]['cal_fullname'];
$emails[$allusers[$i]['cal_login']] = $allusers[$i]['cal_email'];
+
+ if ($ignore_user_case)
+ $names[$allusers[$i]['cal_login']] =
+ strtolower($names[$allusers[$i]['cal_login']]);
}
$attachics = $htmlmail = $languages = $noemail = $t_format = $tz = array ();
@@ -254,7 +258,8 @@
// But, don't send to users who rejected (cal_status='R' ).
function send_reminder ( $id, $event_date ) {
global $ALLOW_EXTERNAL_USERS, $debug, $def_tz, $emails,
- $EXTERNAL_REMINDERS, $attachics, $htmlmail, $is_task, $LANGUAGE, $languages, $names,
+ $EXTERNAL_REMINDERS, $attachics, $htmlmail, $ignore_user_case,
+ $is_task, $LANGUAGE, $languages, $names,
$only_testing, $SERVER_URL, $site_extras, $t_format, $tz;
$ext_participants = $participants = array ();
@@ -271,7 +276,11 @@
if ( $res ) {
while ( $row = dbi_fetch_row ( $res ) ) {
- $participants[$num_participants++] = $row[0];
+ if ($ignore_user_case)
+ $participants[$num_participants++] = strtolower($row[0]);
+ else
+ $participants[$num_participants++] = $row[0];
+
$percentage[$row[0]] = $row[1];
}
}
diff -Naur WebCalendar-1.2.1.orig/translations/English-US.txt WebCalendar-1.2.1.new/translations/English-US.txt
--- WebCalendar-1.2.1.orig/translations/English-US.txt 2010-05-07 19:24:50.000000000 +0200
+++ WebCalendar-1.2.1.new/translations/English-US.txt 2010-05-07 19:27:24.000000000 +0200
@@ -1846,6 +1846,7 @@
Web Server (detected): Web Server (detected)
Web Server (not detected): Web Server (not detected)
None (Single-User): None (Single-User)
+Case-insensitive user name: Case-insensitive user name
Read-Only: Read-Only
Environment: Environment
Production: Production
diff -Naur WebCalendar-1.2.1.orig/translations/French.txt WebCalendar-1.2.1.new/translations/French.txt
--- WebCalendar-1.2.1.orig/translations/French.txt 2010-05-07 19:24:50.000000000 +0200
+++ WebCalendar-1.2.1.new/translations/French.txt 2010-05-07 19:27:24.000000000 +0200
@@ -1794,6 +1794,7 @@
Web Server (detected): =
Web Server (not detected): =
None (Single-User): =
+Case-insensitive user name: =
Read-Only: =
Environment: =
Production: =
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebCalendar/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 5 Jul 2010 15:44:50 -0000 1.2
+++ .cvsignore 8 Jul 2010 14:19:59 -0000 1.3
@@ -1,3 +1,3 @@
-WebCalendar-1.2.0-clean.tar.gz
+WebCalendar-1.2.1-clean.tar.gz
WebCalendar-1.2.0-newmenuicons.tar.gz
WebCalendarUserManual-0.9.43.tar.gz
Index: WebCalendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebCalendar/F-12/WebCalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- WebCalendar.spec 5 Jul 2010 15:44:50 -0000 1.1
+++ WebCalendar.spec 8 Jul 2010 14:19:59 -0000 1.2
@@ -12,15 +12,15 @@
# tar czf WebCalendar-%{version}-clean.tar.gz WebCalendar-%{version}/
#
# Upstream tarball MD5 sum:
-# 520bd108e9e4d2a14425d2b5b8cc2e1e WebCalendar-1.2.0.tar.gz
+# f349ad32a09a76db0526fb27016842fe WebCalendar-1.2.1.tar.gz
#
# Source tarball WebCalendar-1.2.0-newmenuicons.tar.gz is Fedora-
# specific and thus, has no "upstream".
Name: WebCalendar
Summary: Single/multi-user web-based calendar application
-Version: 1.2.0
-Release: 8%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
Source0: WebCalendar-%{version}-clean.tar.gz
@@ -31,16 +31,16 @@ Source4: WebCalendar-taglang.php
Patch1: WebCalendar-1.2.0-newmenuicons.patch
Patch2: WebCalendar-1.2.0-extmenu.patch
Patch3: WebCalendar-1.2.0-extcaptcha.patch
-Patch4: WebCalendar-1.2.0-usercase.patch
-Patch5: WebCalendar-1.2.0-shebang.patch
-Patch6: WebCalendar-1.2.0-nolangwarn.patch
-Patch7: WebCalendar-1.2.0-weektimebar.patch
-Patch8: WebCalendar-1.2.0-deftimezone.patch
-Patch9: WebCalendar-1.2.0-reset_reminder.patch
-Patch10: WebCalendar-1.2.0-offsetdays.patch
-Patch11: WebCalendar-1.2.0-approve.patch
-Patch12: WebCalendar-1.2.0-httpauthpub.patch
-Patch13: WebCalendar-1.2.0-eventstatus.patch
+Patch4: WebCalendar-1.2.0-deftimezone.patch
+Patch5: WebCalendar-1.2.0-reset_reminder.patch
+Patch6: WebCalendar-1.2.0-offsetdays.patch
+Patch7: WebCalendar-1.2.0-approve.patch
+Patch8: WebCalendar-1.2.0-httpauthpub.patch
+Patch9: WebCalendar-1.2.0-eventstatus.patch
+Patch10: WebCalendar-1.2.0-php53.patch
+Patch11: WebCalendar-1.2.0-daylightbug.patch
+Patch12: WebCalendar-1.2.0-viewothers.patch
+Patch13: WebCalendar-1.2.1-usercase.patch
URL: http://www.k5n.us/webcalendar.php
Requires: webserver
Requires: php >= 4.1.0
@@ -143,6 +143,7 @@ done
install -p -m 644 *.php "${RPM_BUILD_ROOT}/%{basepath}/"
install -p -m 644 UPGRADING.html "${RPM_BUILD_ROOT}/%{basepath}/"
+install -p -m 644 AUTHORS "${RPM_BUILD_ROOT}/%{basepath}/"
# Replace bundled libraries by external ones.
@@ -161,6 +162,10 @@ install -p -m 644 UPGRADING.html "${RPM_
)
+# Remove *.orig file created by patches.
+
+find "${RPM_BUILD_ROOT}/%{basepath}" -name '*.orig' -print0 | xargs -0 -r rm -f
+
# Fix permissions.
find "${RPM_BUILD_ROOT}%{basepath}" -type f -print0 | xargs -0 -r chmod ugo-x
@@ -171,6 +176,8 @@ find "${RPM_BUILD_ROOT}%{basepath}/tools
# Process the configuration files.
+install -p -m 644 includes/settings.php.orig \
+ "${RPM_BUILD_ROOT}/%{basepath}/includes/"
install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}"
cp -a "${RPM_BUILD_ROOT}/%{basepath}/includes/settings.php.orig" \
"${RPM_BUILD_ROOT}/%{_sysconfdir}/%{name}/settings.php"
@@ -235,6 +242,18 @@ rm -rf "${RPM_BUILD_ROOT}"
%changelog
#-------------------------------------------------------------------------------
+* Wed Jul 7 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.1-1
+- New upstream version.
+- Patch "php53" to get rid of PHP 5.3 deprecated features.
+ https://sourceforge.net/tracker/?func=detail&aid=2873491&group_id=3870&atid=303870
+- Patch "daylightbug" to fix day offset by one when crossing daylight saving
+ active/inactive date.
+ https://sourceforge.net/tracker/?func=detail&aid=2877076&group_id=3870&atid=303870
+- Patch "viewothers" to allow viewing other users calendar when access control
+ is off.
+ https://sourceforge.net/tracker/?func=detail&aid=2880387&group_id=3870&atid=303870
+- Include AUTHORS in product directory too: needed by the "about" box.
+
* Fri Aug 14 2009 Patrick Monnerat <pm at datasphere.ch> 1.2.0-8
- Use a custom source tarball to get rid of upstream icons with license issue.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebCalendar/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 5 Jul 2010 15:44:50 -0000 1.2
+++ sources 8 Jul 2010 14:19:59 -0000 1.3
@@ -1,3 +1,3 @@
-14e1c3781d1939257effd509633df2a8 WebCalendar-1.2.0-clean.tar.gz
+05175c2eb7143033ad31a1e0a806c27f WebCalendar-1.2.1-clean.tar.gz
c746b936b582c04f69b6052c8c4be2f8 WebCalendar-1.2.0-newmenuicons.tar.gz
ef48b67a09af50404167c66856cc724d WebCalendarUserManual-0.9.43.tar.gz
--- WebCalendar-1.2.0-nolangwarn.patch DELETED ---
--- WebCalendar-1.2.0-shebang.patch DELETED ---
--- WebCalendar-1.2.0-usercase.patch DELETED ---
--- WebCalendar-1.2.0-weektimebar.patch DELETED ---
More information about the scm-commits
mailing list