[WebCalendar/f15/master] * Fri Apr 15 2011 Patrick Monnerat <pm at datasphere.ch> 1.2.3-4 - Patch "nonuser" to fix handling of n

Patrick Monnerat monnerat at fedoraproject.org
Tue Apr 19 13:10:54 UTC 2011 

commit debf20bd7a2a4088999ddd964d35cc45cc63219c
Author: Patrick Monnerat <pm at datasphere.ch>
Date:   Tue Apr 19 15:09:47 2011 +0200

    * Fri Apr 15 2011 Patrick Monnerat <pm at datasphere.ch> 1.2.3-4
    - Patch "nonuser" to fix handling of non-user calendars.
      https://sourceforge.net/tracker/?func=detail&aid=3287576&group_id=3870&atid=303870
    - Patch "etp" to fix a possible bad URL.
      https://sourceforge.net/tracker/?func=detail&aid=3272636&group_id=3870&atid=303870
    - Drop inoperational java control panel.

 WebCalendar-1.2.3-authsettings.patch |   30 ++++----
 WebCalendar-1.2.3-etp.patch          |   12 ++++
 WebCalendar-1.2.3-nonuser.patch      |   71 ++++++++++++++++++++
 WebCalendar-1.2.3-usercase.patch     |  120 ++++++++++++++-------------------
 WebCalendar.spec                     |   29 ++++++--
 5 files changed, 170 insertions(+), 92 deletions(-)
---
diff --git a/WebCalendar-1.2.3-authsettings.patch b/WebCalendar-1.2.3-authsettings.patch
index ced29c5..4ed8a95 100644
--- a/WebCalendar-1.2.3-authsettings.patch
+++ b/WebCalendar-1.2.3-authsettings.patch
@@ -1,6 +1,6 @@
 diff -Naur WebCalendar-1.2.3.orig/includes/auth-settings.php WebCalendar-1.2.3.new/includes/auth-settings.php
 --- WebCalendar-1.2.3.orig/includes/auth-settings.php	1970-01-01 01:00:00.000000000 +0100
-+++ WebCalendar-1.2.3.new/includes/auth-settings.php	2010-11-19 15:48:00.882349262 +0100
++++ WebCalendar-1.2.3.new/includes/auth-settings.php	2011-04-19 14:13:16.134171395 +0200
 @@ -0,0 +1,138 @@
 +<?php
 +// $Id$
@@ -142,13 +142,13 @@ diff -Naur WebCalendar-1.2.3.orig/includes/auth-settings.php WebCalendar-1.2.3.n
 +?>
 diff -Naur WebCalendar-1.2.3.orig/includes/user-app-joomla.php WebCalendar-1.2.3.new/includes/user-app-joomla.php
 --- WebCalendar-1.2.3.orig/includes/user-app-joomla.php	2007-11-02 20:37:45.000000000 +0100
-+++ WebCalendar-1.2.3.new/includes/user-app-joomla.php	2010-11-19 15:35:21.409669189 +0100
++++ WebCalendar-1.2.3.new/includes/user-app-joomla.php	2011-04-19 14:14:37.711659240 +0200
 @@ -20,17 +20,12 @@
  // - user_get_users (returns array of users)
  // - user_load_variables (loads info about a user)
  
 -/************************* Config ***********************************/
-+include_once 'includes/auth-settings.php';
++include_once 'auth-settings.php';
  
 -// Directory that contains the joomla configuration.php file (with trailing slash)
 -$app_path = '/usr/local/www/data/joomla/';
@@ -191,14 +191,14 @@ diff -Naur WebCalendar-1.2.3.orig/includes/user-app-joomla.php WebCalendar-1.2.3
    $error = 'User admin not supported.'; return false;
  }
 diff -Naur WebCalendar-1.2.3.orig/includes/user-app-postnuke.php WebCalendar-1.2.3.new/includes/user-app-postnuke.php
---- WebCalendar-1.2.3.orig/includes/user-app-postnuke.php	2010-11-19 11:19:11.713286647 +0100
-+++ WebCalendar-1.2.3.new/includes/user-app-postnuke.php	2010-11-19 15:38:48.197944382 +0100
+--- WebCalendar-1.2.3.orig/includes/user-app-postnuke.php	2011-04-19 14:11:21.869693484 +0200
++++ WebCalendar-1.2.3.new/includes/user-app-postnuke.php	2011-04-19 14:15:00.083599086 +0200
 @@ -24,22 +24,12 @@
  //   change line 85 in includes/pnSession.php to:
  //      ini_set('session.cookie_path', '/');
  
 -/************************* Config ***********************************/
-+include_once 'includes/auth-settings.php';
++include_once 'auth-settings.php';
  
 -// Location of postnuke config.php file (with trailing slash)
 -$app_path = '/usr/local/www/data/postnuke/';
@@ -238,14 +238,14 @@ diff -Naur WebCalendar-1.2.3.orig/includes/user-app-postnuke.php WebCalendar-1.2
    global $SERVER_URL;
 diff -Naur WebCalendar-1.2.3.orig/includes/user-imap.php WebCalendar-1.2.3.new/includes/user-imap.php
 --- WebCalendar-1.2.3.orig/includes/user-imap.php	2008-03-12 11:42:03.000000000 +0100
-+++ WebCalendar-1.2.3.new/includes/user-imap.php	2010-11-19 18:17:08.971944579 +0100
++++ WebCalendar-1.2.3.new/includes/user-imap.php	2011-04-19 14:14:44.444039278 +0200
 @@ -18,25 +18,11 @@
   * @subpackage IMAPAuthentication
   */
  defined ( '_ISVALID' ) or die ( 'You cannot access this file directly!' );
 -// Set some global config variables about your system.
 +
-+include_once 'includes/auth-settings.php';
++include_once 'auth-settings.php';
 +
 +// Password is handled by IMAP authentication scheme: cannot be changed.
  $user_can_update_password = false;
@@ -280,8 +280,8 @@ diff -Naur WebCalendar-1.2.3.orig/includes/user-imap.php WebCalendar-1.2.3.new/i
              //refresh their password in webcal_user
              user_update_user_password ( $login, $password );
 diff -Naur WebCalendar-1.2.3.orig/includes/user-ldap.php WebCalendar-1.2.3.new/includes/user-ldap.php
---- WebCalendar-1.2.3.orig/includes/user-ldap.php	2010-11-19 11:19:11.713286647 +0100
-+++ WebCalendar-1.2.3.new/includes/user-ldap.php	2010-11-19 15:35:04.725324335 +0100
+--- WebCalendar-1.2.3.orig/includes/user-ldap.php	2011-04-19 14:11:21.870693392 +0200
++++ WebCalendar-1.2.3.new/includes/user-ldap.php	2011-04-19 14:15:11.948506487 +0200
 @@ -17,77 +17,14 @@
   * these functions and you will still need to add users to webcal_user.
   */
@@ -289,7 +289,7 @@ diff -Naur WebCalendar-1.2.3.orig/includes/user-ldap.php WebCalendar-1.2.3.new/i
 -/***************************** Config *******************************/
 -// Set some global config variables about your system.
 -// Next three are NOT yet implemented for LDAP
-+include_once 'includes/auth-settings.php';
++include_once 'auth-settings.php';
 +
 +// Next three features are NOT yet implemented for LDAP
 +
@@ -375,12 +375,12 @@ diff -Naur WebCalendar-1.2.3.orig/includes/user-ldap.php WebCalendar-1.2.3.new/i
    $error = 'Not yet supported.';
 diff -Naur WebCalendar-1.2.3.orig/includes/user-nis.php WebCalendar-1.2.3.new/includes/user-nis.php
 --- WebCalendar-1.2.3.orig/includes/user-nis.php	2007-08-17 16:39:01.000000000 +0200
-+++ WebCalendar-1.2.3.new/includes/user-nis.php	2010-11-19 15:23:51.302416559 +0100
++++ WebCalendar-1.2.3.new/includes/user-nis.php	2011-04-19 14:14:52.620286357 +0200
 @@ -12,19 +12,16 @@
  // need these functions and you will still need to add users to
  // webcal_user.
  
-+include_once 'includes/auth-settings.php';
++include_once 'auth-settings.php';
 +
  if ( ! defined ( 'CRYPT_SALT_LENGTH' ) )
    define ( 'CRYPT_SALT_LENGTH', 12 );
@@ -409,7 +409,7 @@ diff -Naur WebCalendar-1.2.3.orig/includes/user-nis.php WebCalendar-1.2.3.new/in
      }
 diff -Naur WebCalendar-1.2.3.orig/includes/user.php WebCalendar-1.2.3.new/includes/user.php
 --- WebCalendar-1.2.3.orig/includes/user.php	2007-08-17 16:39:01.000000000 +0200
-+++ WebCalendar-1.2.3.new/includes/user.php	2010-11-19 14:47:03.787535039 +0100
++++ WebCalendar-1.2.3.new/includes/user.php	2011-04-19 14:14:29.548410964 +0200
 @@ -20,11 +20,7 @@
   */
  defined ( '_ISVALID' ) or die ( 'You cannot access this file directly!' );
@@ -419,7 +419,7 @@ diff -Naur WebCalendar-1.2.3.orig/includes/user.php WebCalendar-1.2.3.new/includ
 -$admin_can_add_user = true;
 -$admin_can_delete_user = true;
 -$admin_can_disable_user = false;
-+include_once 'includes/auth-settings.php';
++include_once 'auth-settings.php';
  
  /**
   * Check to see if a given login/password is valid.
diff --git a/WebCalendar-1.2.3-etp.patch b/WebCalendar-1.2.3-etp.patch
new file mode 100644
index 0000000..4db8f41
--- /dev/null
+++ b/WebCalendar-1.2.3-etp.patch
@@ -0,0 +1,12 @@
+diff -Naur WebCalendar-1.2.3.orig/includes/menu/index.php WebCalendar-1.2.3.new/includes/menu/index.php
+--- WebCalendar-1.2.3.orig/includes/menu/index.php	2011-04-19 13:08:51.178088428 +0200
++++ WebCalendar-1.2.3.new/includes/menu/index.php	2011-04-19 13:18:19.466766130 +0200
+@@ -70,7 +70,7 @@
+     $year_url .= '?user=' . $user;
+ 
+     if ( ! empty ( $new_entry_url ) )
+-      $new_entry_url .= '&user=' . $user;
++      $new_entry_url .= (strpos($new_entry_url, '?') !== FALSE? '&': '?') . 'user=' . $user;
+ 
+     if ( ! empty ( $new_task_url ) )
+       $new_task_url .= '&user=' . $user;
diff --git a/WebCalendar-1.2.3-nonuser.patch b/WebCalendar-1.2.3-nonuser.patch
new file mode 100644
index 0000000..45f6cee
--- /dev/null
+++ b/WebCalendar-1.2.3-nonuser.patch
@@ -0,0 +1,71 @@
+diff -Naur WebCalendar-1.2.3.orig/includes/classes/WebCalendar.class WebCalendar-1.2.3.new/includes/classes/WebCalendar.class
+--- WebCalendar-1.2.3.orig/includes/classes/WebCalendar.class	2011-04-14 17:11:22.307271821 +0200
++++ WebCalendar-1.2.3.new/includes/classes/WebCalendar.class	2011-04-14 19:20:58.351077771 +0200
+@@ -153,6 +153,7 @@
+     load_global_settings ();
+ 
+     $this->setLanguage ();
++    $user = getValue ( 'user', '[A-Za-z0-9_\.=@,\-]*', true );
+ 
+     if ( empty ( $ovrd ) )
+       load_user_preferences ();
+@@ -166,7 +167,6 @@
+     $id = getValue ( 'id', '[0-9]+', true );
+     $minute = getValue ( 'minute', '[0-9]+' );
+     $month = getValue ( 'month', '[0-9]+' );
+-    $user = getValue ( 'user', '[A-Za-z0-9_\.=@,\-]*', true );
+     $year = getValue ( 'year', '[0-9]+' );
+     if ( empty ( $PUBLIC_ACCESS ) )
+       $PUBLIC_ACCESS = 'N';
+@@ -227,7 +227,8 @@
+ 
+       if ( ! empty ( $user ) ) {
+         $u_url = 'user=' . $user . '&amp;';
+-        user_load_variables ( $user, 'user_' );
++        if (!user_load_variables ( $user, 'user_' ))
++          nonuser_load_variables($user, 'user_');
+         if ( $user == '__public__' )
+           $user_fullname = translate ( $PUBLIC_ACCESS_FULLNAME );
+       } else {
+diff -Naur WebCalendar-1.2.3.orig/includes/functions.php WebCalendar-1.2.3.new/includes/functions.php
+--- WebCalendar-1.2.3.orig/includes/functions.php	2011-04-14 17:11:22.271275172 +0200
++++ WebCalendar-1.2.3.new/includes/functions.php	2011-04-14 19:22:25.296955185 +0200
+@@ -4275,6 +4275,7 @@
+       $GLOBALS[$prefix . 'login'] = $row[0];
+       $GLOBALS[$prefix . 'lastname'] = $row[1];
+       $GLOBALS[$prefix . 'firstname'] = $row[2];
++      $GLOBALS[$prefix . 'fullname'] = trim($raw[1] . ' ' . $row[2]);
+       $GLOBALS[$prefix . 'admin'] = $row[3];
+       $GLOBALS[$prefix . 'is_public'] = $row[4];
+       $GLOBALS[$prefix . 'url'] = $row[5];
+@@ -5860,7 +5861,8 @@
+   if ( $rows ) {
+     for ( $i = 0, $cnt = count ( $rows ); $i < $cnt; $i++ ) {
+       $row = $rows[$i];
+-      user_load_variables ( $row[0], 'bosstemp_' );
++      if (!user_load_variables ( $row[0], 'bosstemp_' ))
++        nonuser_load_variables($row[0], 'bosstemp_');
+       $ret[$count++] = array (
+         'cal_login' => $row[0],
+         'cal_fullname' => $bosstemp_fullname
+diff -Naur WebCalendar-1.2.3.orig/includes/menu/index.php WebCalendar-1.2.3.new/includes/menu/index.php
+--- WebCalendar-1.2.3.orig/includes/menu/index.php	2011-04-14 17:11:22.171284485 +0200
++++ WebCalendar-1.2.3.new/includes/menu/index.php	2011-04-14 19:33:10.341676201 +0200
+@@ -211,12 +211,17 @@
+   }
+   $groups = '';
+   $grouplistcnt = count ( $grouplist );
++  $gdone = array();
+   for ( $i = 0; $i < $grouplistcnt; $i++ ) {
+     $l = $grouplist[$i]['cal_login'];
+     $f = $grouplist[$i]['cal_fullname'];
+     // Don't display current $user in group list.
+     if ( ! empty ( $user ) && $user == $l )
+       continue;
++    // Do not show duplicate entries.
++    if (isset($gdone[$l]))
++      continue;
++    $gdone[$l] = true;
+     /*
+ Use the preferred view if it is day/month/week/year.php. Try not to use a
+ user-created view because it might not display the proper user's events.
diff --git a/WebCalendar-1.2.3-usercase.patch b/WebCalendar-1.2.3-usercase.patch
index 7ca29f9..ea888c5 100644
--- a/WebCalendar-1.2.3-usercase.patch
+++ b/WebCalendar-1.2.3-usercase.patch
@@ -1,53 +1,28 @@
 diff -Naur WebCalendar-1.2.3.orig/includes/classes/WebCalendar.class WebCalendar-1.2.3.new/includes/classes/WebCalendar.class
---- WebCalendar-1.2.3.orig/includes/classes/WebCalendar.class	2010-10-08 15:16:09.000000000 +0200
-+++ WebCalendar-1.2.3.new/includes/classes/WebCalendar.class	2010-10-08 15:17:44.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';
+--- WebCalendar-1.2.3.orig/includes/classes/WebCalendar.class	2011-04-15 16:04:54.283579361 +0200
++++ WebCalendar-1.2.3.new/includes/classes/WebCalendar.class	2011-04-15 16:10:30.358195449 +0200
+@@ -152,7 +152,7 @@
+     load_global_settings ();
  
-+    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;
+     $this->setLanguage ();
+-    $user = getValue ( 'user', '[A-Za-z0-9_\.=@,\-]*', true );
++    $user = user_case(getValue ( 'user', '[A-Za-z0-9_\.=@,\-]*', true ));
  
-     /* If WebCalendar is configured to use http authentication, then we can
-@@ -571,6 +575,10 @@
+     if ( empty ( $ovrd ) )
+       load_user_preferences ();
+@@ -572,6 +572,9 @@
          }
        }
      }
 +
 +    //     If login is not case-sensitive, map it to lowercase now.
-+    if ($ignore_user_case)
-+     $login = strtolower($login);
++    $login = user_case($login);
    }
  
    /* Initializations from includes/connect.php.
 diff -Naur WebCalendar-1.2.3.orig/includes/config.php WebCalendar-1.2.3.new/includes/config.php
 --- WebCalendar-1.2.3.orig/includes/config.php	2010-08-15 20:54:34.000000000 +0200
-+++ WebCalendar-1.2.3.new/includes/config.php	2010-10-08 15:17:44.000000000 +0200
++++ WebCalendar-1.2.3.new/includes/config.php	2011-04-15 16:06:24.009200588 +0200
 @@ -104,9 +104,10 @@
  
  function do_config ( $fileLoc ) {
@@ -74,9 +49,32 @@ diff -Naur WebCalendar-1.2.3.orig/includes/config.php WebCalendar-1.2.3.new/incl
    // Type of user authentication.
    $user_inc = $settings['user_inc'];
  
+diff -Naur WebCalendar-1.2.3.orig/includes/functions.php WebCalendar-1.2.3.new/includes/functions.php
+--- WebCalendar-1.2.3.orig/includes/functions.php	2011-04-15 16:04:54.285579173 +0200
++++ WebCalendar-1.2.3.new/includes/functions.php	2011-04-15 16:22:45.223561231 +0200
+@@ -6135,4 +6135,19 @@
+   return $ret;
+ }
+ 
++/* Translate user name to lower case if required. */
++function user_case($user)
++{
++  global $ignore_user_case, $NONUSER_PREFIX;
++
++  if (!$ignore_user_case)
++    return $user;
++
++  if (!empty($NONUSER_PREFIX) &&
++   substr($user, 0, strlen($NONUSER_PREFIX)) == $NONUSER_PREFIX)
++    return $user;
++
++  return strtolower($user);
++}
++
+ ?>
 diff -Naur WebCalendar-1.2.3.orig/includes/settings.php.orig WebCalendar-1.2.3.new/includes/settings.php.orig
 --- WebCalendar-1.2.3.orig/includes/settings.php.orig	2007-09-28 15:19:45.000000000 +0200
-+++ WebCalendar-1.2.3.new/includes/settings.php.orig	2010-10-08 15:17:44.000000000 +0200
++++ WebCalendar-1.2.3.new/includes/settings.php.orig	2011-04-15 16:06:24.009200588 +0200
 @@ -71,5 +71,10 @@
  # need to modify user-ldap.php to configure some settings.
  user_inc: user.php
@@ -89,8 +87,8 @@ diff -Naur WebCalendar-1.2.3.orig/includes/settings.php.orig WebCalendar-1.2.3.n
  # end */
  ?>
 diff -Naur WebCalendar-1.2.3.orig/install/index.php WebCalendar-1.2.3.new/install/index.php
---- WebCalendar-1.2.3.orig/install/index.php	2010-10-08 15:16:09.000000000 +0200
-+++ WebCalendar-1.2.3.new/install/index.php	2010-10-08 15:17:44.000000000 +0200
+--- WebCalendar-1.2.3.orig/install/index.php	2011-04-15 16:04:54.221585149 +0200
++++ WebCalendar-1.2.3.new/install/index.php	2011-04-15 16:06:24.009200588 +0200
 @@ -660,6 +660,7 @@
      $settings['install_password'] = '';
      $settings['single_user_login'] = '';
@@ -136,45 +134,29 @@ diff -Naur WebCalendar-1.2.3.orig/install/index.php WebCalendar-1.2.3.new/instal
      <td class="prompt"><?php etranslate ( 'Read-Only' ) ?>:</td>
      <td>
 diff -Naur WebCalendar-1.2.3.orig/tools/send_reminders.php WebCalendar-1.2.3.new/tools/send_reminders.php
---- WebCalendar-1.2.3.orig/tools/send_reminders.php	2010-10-08 15:16:09.000000000 +0200
-+++ WebCalendar-1.2.3.new/tools/send_reminders.php	2010-10-08 15:17:44.000000000 +0200
-@@ -103,6 +103,10 @@
+--- WebCalendar-1.2.3.orig/tools/send_reminders.php	2011-04-15 16:04:54.224584869 +0200
++++ WebCalendar-1.2.3.new/tools/send_reminders.php	2011-04-15 16:15:05.960459242 +0200
+@@ -101,7 +101,7 @@
+ $allusers = user_get_users ();
+ $allusercnt = count ( $allusers );
  for ( $i = 0; $i < $allusercnt; $i++ ) {
-   $names[$allusers[$i]['cal_login']] = $allusers[$i]['cal_fullname'];
+-  $names[$allusers[$i]['cal_login']] = $allusers[$i]['cal_fullname'];
++  $names[$allusers[$i]['cal_login']] = user_case($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 @@
+@@ -271,7 +271,7 @@
  
    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];
-+
++      $participants[$num_participants++] = user_case($row[0]);
        $percentage[$row[0]] = $row[1];
      }
    }
 diff -Naur WebCalendar-1.2.3.orig/translations/English-US.txt WebCalendar-1.2.3.new/translations/English-US.txt
---- WebCalendar-1.2.3.orig/translations/English-US.txt	2010-10-08 15:16:09.000000000 +0200
-+++ WebCalendar-1.2.3.new/translations/English-US.txt	2010-10-08 15:17:44.000000000 +0200
+--- WebCalendar-1.2.3.orig/translations/English-US.txt	2011-04-15 16:04:54.190588045 +0200
++++ WebCalendar-1.2.3.new/translations/English-US.txt	2011-04-15 16:06:24.011200370 +0200
 @@ -1844,6 +1844,7 @@
  Web Server (detected): Web Server (detected)
  Web Server (not detected): Web Server (not detected)
@@ -184,8 +166,8 @@ diff -Naur WebCalendar-1.2.3.orig/translations/English-US.txt WebCalendar-1.2.3.
  Environment: Environment
  Production: Production
 diff -Naur WebCalendar-1.2.3.orig/translations/French.txt WebCalendar-1.2.3.new/translations/French.txt
---- WebCalendar-1.2.3.orig/translations/French.txt	2010-10-08 15:16:09.000000000 +0200
-+++ WebCalendar-1.2.3.new/translations/French.txt	2010-10-08 15:17:44.000000000 +0200
+--- WebCalendar-1.2.3.orig/translations/French.txt	2011-04-15 16:04:54.200587110 +0200
++++ WebCalendar-1.2.3.new/translations/French.txt	2011-04-15 16:06:24.011200370 +0200
 @@ -1794,6 +1794,7 @@
  Web Server (detected): =
  Web Server (not detected): =
diff --git a/WebCalendar.spec b/WebCalendar.spec
index e3a6b79..96c18e8 100644
--- a/WebCalendar.spec
+++ b/WebCalendar.spec
@@ -1,5 +1,5 @@
-%define		basepath	%{_datadir}/%{name}
-%define		manualVersion	0.9.43
+%global		basepath	%{_datadir}/%{name}
+%global		manualVersion	0.9.43
 
 #	The main tarball in this package is a downgraded version of the
 #		upstream tarball, because of menu icon license issues.
@@ -20,7 +20,7 @@
 Name:		WebCalendar
 Summary:	Single/multi-user web-based calendar application
 Version:	1.2.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	WebCalendar-%{version}-clean.tar.gz
@@ -40,8 +40,10 @@ 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.3-usercase.patch
-Patch14:	WebCalendar-1.2.3-authsettings.patch
+Patch13:	WebCalendar-1.2.3-nonuser.patch
+Patch14:	WebCalendar-1.2.3-usercase.patch
+Patch15:	WebCalendar-1.2.3-authsettings.patch
+Patch16:	WebCalendar-1.2.3-etp.patch
 URL:		http://www.k5n.us/webcalendar.php
 Requires:	webserver
 Requires:	php >= 4.1.0
@@ -109,6 +111,8 @@ rm -rf includes/classes/captcha
 %patch12 -p 1
 %patch13 -p 1
 %patch14 -p 1
+%patch15 -p 1
+%patch16 -p 1
 
 
 #-------------------------------------------------------------------------------
@@ -176,6 +180,11 @@ find "${RPM_BUILD_ROOT}%{basepath}/tools" -type f -name '*.php' -print0	|
 find "${RPM_BUILD_ROOT}%{basepath}/tools" -type f -name '*.pl' -print0	|
 	xargs -0 -r chmod ugo+x
 
+#	Java control panel is not (yet) operational.
+
+rm -f "${RPM_BUILD_ROOT}%{basepath}/controlpanel.php"
+rm -f "${RPM_BUILD_ROOT}%{basepath}/ws/webcalendar.jar"
+
 #	Process the configuration files.
 
 install -p -m 644 includes/settings.php.orig				\
@@ -247,11 +256,15 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 #-------------------------------------------------------------------------------
 %changelog
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 #-------------------------------------------------------------------------------
 
+* Fri Apr 15 2011 Patrick Monnerat <pm at datasphere.ch> 1.2.3-4
+- Patch "nonuser" to fix handling of non-user calendars.
+  https://sourceforge.net/tracker/?func=detail&aid=3287576&group_id=3870&atid=303870
+- Patch "etp" to fix a possible bad URL.
+  https://sourceforge.net/tracker/?func=detail&aid=3272636&group_id=3870&atid=303870
+- Drop inoperational java control panel.
+
 * Fri Nov 19 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.3-2
 - Patch "authsettings" to move authentication schemes settings into a
   separate configuration file (BZ 654479).

More information about the scm-commits mailing list