[imc-sf-coders] CVS update of sf-active/sf-active/sitename/website/calendar (4 files)

[Bart M]

    Date: Wednesday, December 28, 2005 @ 09:30:15
  Author: pseudopunk
    Path: /cvsroot/sf-active/sf-active/sf-active/sitename/website/calendar

Modified: event_display_add_confirm.php event_display_delete.php
          event_display_edit.php event_display_week.php

layout fixes


Index: sf-active/sf-active/sitename/website/calendar/event_display_add_confirm.php
diff -u sf-active/sf-active/sitename/website/calendar/event_display_add_confirm.php:1.6 sf-active/sf-active/sitename/website/calendar/event_display_add_confirm.php:1.7
--- sf-active/sf-active/sitename/website/calendar/event_display_add_confirm.php:1.6	Sat Dec 25 20:29:43 2004
+++ sf-active/sf-active/sitename/website/calendar/event_display_add_confirm.php	Wed Dec 28 09:30:15 2005
@@ -12,12 +12,10 @@
 } else {
 
     $page->build_page();
-
-	// Includes here so we can send a header from the class
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-header.inc");
+    sf_include_file(SF_INCLUDE_PATH, 'content-header.inc');
+    sf_include_file(SF_INCLUDE_PATH, 'index_left.inc');
     echo $page->get_html();
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-footer.inc"); 
-	
+    sf_include_file(SF_INCLUDE_PATH, 'content-footer.inc');
 }
 
 
Index: sf-active/sf-active/sitename/website/calendar/event_display_delete.php
diff -u sf-active/sf-active/sitename/website/calendar/event_display_delete.php:1.3 sf-active/sf-active/sitename/website/calendar/event_display_delete.php:1.4
--- sf-active/sf-active/sitename/website/calendar/event_display_delete.php:1.3	Sat Dec 25 20:29:43 2004
+++ sf-active/sf-active/sitename/website/calendar/event_display_delete.php	Wed Dec 28 09:30:15 2005
@@ -2,17 +2,16 @@
 
 include_once("shared/global.cfg");
 
-$sftr = new Translate();
 $page = new Page('event_display_delete');
 
 if ($page->get_error()) {
     echo "Fatal error: " . $page->get_error();
 } else {
     $page->build_page();
-
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-header.inc");
+    sf_include_file(SF_INCLUDE_PATH, 'content-header.inc');
+    sf_include_file(SF_INCLUDE_PATH, 'index_left.inc');
     echo $page->get_html();
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-footer.inc"); 
+    sf_include_file(SF_INCLUDE_PATH, 'content-footer.inc');
 }
 
 
Index: sf-active/sf-active/sitename/website/calendar/event_display_edit.php
diff -u sf-active/sf-active/sitename/website/calendar/event_display_edit.php:1.3 sf-active/sf-active/sitename/website/calendar/event_display_edit.php:1.4
--- sf-active/sf-active/sitename/website/calendar/event_display_edit.php:1.3	Sat Dec 25 20:29:43 2004
+++ sf-active/sf-active/sitename/website/calendar/event_display_edit.php	Wed Dec 28 09:30:15 2005
@@ -4,7 +4,6 @@
 
 include_once("shared/global.cfg");
 
-$sftr = new Translate();
 $page = new Page('event_display_edit');
 
 if ($page->get_error()) {
@@ -12,12 +11,10 @@
 } else {
 
     $page->build_page();
-
-    // Includes here so we can send a header from the class
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-header.inc");
+    sf_include_file(SF_INCLUDE_PATH, 'content-header.inc');
+    sf_include_file(SF_INCLUDE_PATH, 'index_left.inc');
     echo $page->get_html();
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-footer.inc"); 
-	
+    sf_include_file(SF_INCLUDE_PATH, 'content-footer.inc');
 }
 
 
Index: sf-active/sf-active/sitename/website/calendar/event_display_week.php
diff -u sf-active/sf-active/sitename/website/calendar/event_display_week.php:1.29 sf-active/sf-active/sitename/website/calendar/event_display_week.php:1.30
--- sf-active/sf-active/sitename/website/calendar/event_display_week.php:1.29	Sat Dec 25 20:29:43 2004
+++ sf-active/sf-active/sitename/website/calendar/event_display_week.php	Wed Dec 28 09:30:15 2005
@@ -1,19 +1,4 @@
 <?php
-include_once("shared/global.cfg");
-
-$sftr = new Translate();
-$Title = $sftr->trans('calendar');
-
-$page = new Page('event_display_week');
-
-if ($page->get_error()) {
-    echo "Fatal error: " . $page->get_error();
-} else {
-    $page->build_page();
-
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-header.inc");
-    echo $page->get_html();
-	include_once(SF_INCLUDE_PATH."/".$GLOBALS['lang']."/content-footer.inc"); 
-}
-
+header('Location: index.php');
+exit;
 ?>