[Openfirst-cvscommit] members openfirst.info.php,1.3,1.4 workspace.php,1.26,1.27

[Jamie <ast...@us...>]

Update of /cvsroot/openfirst/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv996/members

Modified Files:
	openfirst.info.php workspace.php 
Log Message:
Fix for Bug #196 (removing php iCalendar)

Index: openfirst.info.php
===================================================================
RCS file: /cvsroot/openfirst/members/openfirst.info.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** openfirst.info.php	15 May 2005 18:49:23 -0000	1.3
--- openfirst.info.php	6 Nov 2005 19:05:27 -0000	1.4
***************
*** 4,9 ****
  $Modules['members']['ver']    = 'CVS';
  $Modules['members']['inc']    = array ();
! $Modules['members']['admin']  = '<a href="$basepath/members/adduser.php">Add Users</a> | <a href="$basepath/members/phpicalendar/admin.php">Administrate Calendar</a> | <a href="$basepath/members/admin/">Manage Users</a> | <a href="$basepath/members/admin/editdivisions.php">Edit Divisions</a> | <a href="$basepath/members/admin/editmember.php">Edit Member</a> | <a href="$basepath/config/">Site Configuration</a>';
! $Modules['members']['nav']    = '<a href="$basepath/members/workspace.php">My Workspace</a> | <a href="$basepath/members/phpicalendar/month.php">Team Calendar</a> | <a href="$basepath/members/divisions.php">Team Divisions</a> | <a href="$basepath/members/profile.php">Member List</a> | <a href="$basepath/members/links.php">Site Links</a> | <a href="$basepath/members/skills.php">My Skills</a> | <a href="$basepath/members/updateprofile.php">My Profile</a> | <a href="$basepath/members/logout.php">Logout</a>';
  
  if (!isset($Modules['awards']['active'])) {
--- 4,9 ----
  $Modules['members']['ver']    = 'CVS';
  $Modules['members']['inc']    = array ();
! $Modules['members']['admin']  = '<a href="$basepath/members/adduser.php">Add Users</a> | <a href="$basepath/members/admin/">Manage Users</a> | <a href="$basepath/members/admin/editdivisions.php">Edit Divisions</a> | <a href="$basepath/members/admin/editmember.php">Edit Member</a> | <a href="$basepath/config/">Site Configuration</a>';
! $Modules['members']['nav']    = '<a href="$basepath/members/workspace.php">My Workspace</a> | <a href="$basepath/members/divisions.php">Team Divisions</a> | <a href="$basepath/members/profile.php">Member List</a> | <a href="$basepath/members/links.php">Site Links</a> | <a href="$basepath/members/skills.php">My Skills</a> | <a href="$basepath/members/updateprofile.php">My Profile</a> | <a href="$basepath/members/logout.php">Logout</a>';
  
  if (!isset($Modules['awards']['active'])) {

Index: workspace.php
===================================================================
RCS file: /cvsroot/openfirst/members/workspace.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** workspace.php	2 Apr 2005 23:26:34 -0000	1.26
--- workspace.php	6 Nov 2005 19:05:27 -0000	1.27
***************
*** 218,230 ****
              echo("</td></tr>
                  </table></td><td>");
!         if($fi->filetype == "ics") {
!           if(file_exists("./phpicalendar/") && isset($_GET["transferics"]) == false) {
!             echo("Would you like to send this file to PHP iCalendar?
!              <a href='". $_SERVER["REQUEST_URI"] . "&amp;transferics=true'>Yes, I would like to copy this file to PHP iCalendar</a>");
!           } elseif(file_exists("./phpicalendar/") && isset($_GET["transferics"]) == true) {
!             copy("$ws->virtfspath$fi->location/$fi->name", "phpicalendar/calendars/$user->user-$fi->name");
!             echo("Calendar has been copied into PHP iCalendar. [ <a href='phpicalendar/'>View PHP iCalendar</a> ]");
!           }
!         } elseif(isset($fimg) && ($fimg == "icons/mimetypes/html.png" || $fimg == "icons/mimetypes/txt.png")) {
             if (($fi->division == $user->division && substr($fi->permissions, 5,1) == "w") || ($fi->owner == $user->user && substr($fi->permissions, 2,1) == "w") || (substr($fi->permissions, 8,1) == "w")) { 
               echo("<form method='post' action='workspace.php'>");
--- 218,222 ----
              echo("</td></tr>
                  </table></td><td>");
!         if(isset($fimg) && ($fimg == "icons/mimetypes/html.png" || $fimg == "icons/mimetypes/txt.png")) {
             if (($fi->division == $user->division && substr($fi->permissions, 5,1) == "w") || ($fi->owner == $user->user && substr($fi->permissions, 2,1) == "w") || (substr($fi->permissions, 8,1) == "w")) { 
               echo("<form method='post' action='workspace.php'>");