rpms/WebCalendar/devel WebCalendar-1.2.0-eventstatus.patch, NONE, 1.1 WebCalendar-1.2.0-shebang.patch, NONE, 1.1 WebCalendar.spec, 1.1, 1.2

[Patrick Monnerat]

Author: monnerat

Update of /cvs/pkgs/rpms/WebCalendar/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17255

Modified Files:
	WebCalendar.spec 
Added Files:
	WebCalendar-1.2.0-eventstatus.patch 
	WebCalendar-1.2.0-shebang.patch 
Log Message:
* Mon Jul  5 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.0-9
- New version number needed for cvs retagging (bad initial cvs import).


WebCalendar-1.2.0-eventstatus.patch:
 view_entry.php |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE WebCalendar-1.2.0-eventstatus.patch ---
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	2008-07-04 16:01:57.000000000 +0200
+++ WebCalendar-1.2.0.new/view_entry.php	2009-06-19 16:05:49.000000000 +0200
@@ -935,18 +935,25 @@
   echo $printerStr;
 
 if ( ( $is_my_event || $is_nonuser_admin || $is_assistant || $can_approve ) &&
-    $event_status == 'W' && $readonly == 'N' && $login != '__public__') {
-  $approveStr = translate ( 'Approve/Confirm entry' );
-  $rejectStr = translate ( 'Reject entry' );
-  echo '
-      <li><a title="' . $approveStr . '" class="nav" href="approve_entry.php?id='
-   . $id . $u_url . '&amp;type=E" onclick="return confirm( \''
-   . translate ( 'Approve this entry?', true ) . '\' );">' . $approveStr
-   . '</a></li>
-      <li><a title="' . $rejectStr . '"  class="nav" href="reject_entry.php?id='
-   . $id . $u_url . '&amp;type=E" onclick="return confirm( \''
-   . translate ( 'Reject this entry?', true ) . '\' );">' . $rejectStr
-   . '</a></li>';
+    $readonly == 'N' && $login != '__public__') {
+  if ($event_status != 'A') {
+    $approveStr = translate ( 'Approve/Confirm entry' );
+    echo '
+        <li><a title="' . $approveStr . '" class="nav" ' .
+        'href="approve_entry.php?id=' . $id . $u_url .
+        '&amp;type=E" onclick="return confirm( \'' .
+        translate ( 'Approve this entry?', true ) . '\' );">' . $approveStr .
+        '</a></li>';
+  }
+  if ($event_status != 'R') {
+    $rejectStr = translate ( 'Reject entry' );
+    echo '
+        <li><a title="' . $rejectStr . '" class="nav" ' .
+        'href="reject_entry.php?id=' . $id . $u_url .
+        '&amp;type=E" onclick="return confirm( \'' .
+        translate ( 'Reject this entry?', true ) . '\' );">' . $rejectStr .
+        '</a></li>';
+  }
 }
 // TODO add these permissions to the UAC list
 $can_add_attach = ( Doc::attachmentsEnabled () && $login != '__public__'

WebCalendar-1.2.0-shebang.patch:
 convert_passwords.php |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE WebCalendar-1.2.0-shebang.patch ---
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	2007-12-23 02:32:02.000000000 +0100
+++ WebCalendar-1.2.0.new/tools/convert_passwords.php	2008-11-07 18:27:29.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/local/bin/php -q
 <?php
 /*
  * $Id: convert_passwords.php,v 1.8.2.4 2007/11/13 21:38:35 umcesrjones Exp $


Index: WebCalendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebCalendar/devel/WebCalendar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- WebCalendar.spec	5 Jul 2010 13:17:16 -0000	1.1
+++ WebCalendar.spec	5 Jul 2010 13:37:49 -0000	1.2
@@ -20,7 +20,7 @@
 Name:		WebCalendar
 Summary:	Single/multi-user web-based calendar application
 Version:	1.2.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	WebCalendar-%{version}-clean.tar.gz
@@ -235,6 +235,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %changelog
 #-------------------------------------------------------------------------------
 
+* Mon Jul  5 2010 Patrick Monnerat <pm at datasphere.ch> 1.2.0-9
+- New version number needed for cvs retagging (bad initial cvs import).
+
 * 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.