might help with login & not-authorized errors

craigk5n · Feb 11, 2024 · 93a03b1 · 93a03b1
1 parent 224a5ae
commit 93a03b1
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 31 deletions.
diff --git a/ajax.php b/ajax.php
@@ -4,14 +4,14 @@
  * This is the handler for Ajax httpXmlRequests.
  */
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/autocomplete_ajax.php b/autocomplete_ajax.php
@@ -18,14 +18,14 @@
  *  }
  */
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/events_ajax.php b/events_ajax.php
@@ -12,6 +12,7 @@
  * TODO: hide private events of other users.
  */
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 require_once 'includes/classes/Event.php';
 require_once 'includes/classes/RptEvent.php';
@@ -21,7 +22,6 @@
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 
@@ -33,8 +33,8 @@
 // Load Doc classes for attachments and comments
 require_once 'includes/classes/Doc.php';
 require_once 'includes/classes/DocList.php';
-require_once 'includes/classes/CommentList.php';
 require_once 'includes/classes/AttachmentList.php';
+require_once 'includes/classes/CommentList.php';
 
 $WebCalendar->initializeSecondPhase();
 

diff --git a/freebusy.php b/freebusy.php
@@ -41,6 +41,7 @@
  */
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 require_once 'includes/classes/Event.php';
 require_once 'includes/classes/RptEvent.php';
@@ -50,7 +51,6 @@
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/icalclient.php b/icalclient.php
@@ -82,14 +82,14 @@
  */
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/includes/init.php b/includes/init.php
@@ -19,18 +19,18 @@
  *   3. call the print_header function with proper arguments
  *
  * What gets called:
+ *   - require_once 'includes/translate.php';
+ *   - require_once 'includes/functions.php';
+ *   - require_once 'includes/classes/WebCalendar.php';
  *   - require_once "includes/$user_inc";
  *   - require_once 'includes/access.php';
  *   - require_once 'includes/assert.php';
  *   - require_once 'includes/classes/Event.php';
  *   - require_once 'includes/classes/RptEvent.php';
- *   - require_once 'includes/classes/WebCalendar.php';
  *   - require_once 'includes/config.php';
  *   - require_once 'includes/dbi4php.php';
  *   - require_once 'includes/formvars.php';
- *   - require_once 'includes/functions.php';
  *   - require_once 'includes/site_extras.php';
- *   - require_once 'includes/translate.php';
  *   - require_once 'includes/validate.php';
  *
  * Also, for month.php, day.php, week.php, week_details.php:
@@ -49,17 +49,17 @@
  }
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
+require_once 'includes/classes/WebCalendar.php';
 require_once 'includes/classes/Event.php';
 require_once 'includes/classes/RptEvent.php';
-require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/assert.php';
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/layers_ajax.php b/layers_ajax.php
@@ -4,14 +4,14 @@
  *   Handler for AJAX requests from layers.php.
  */
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/login-app.php b/login-app.php
@@ -1,13 +1,13 @@
 <?php
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/login.php b/login.php
@@ -1,14 +1,14 @@
 <?php
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 session_name(getSessionName());
 @session_start();

diff --git a/nulogin.php b/nulogin.php
@@ -3,14 +3,14 @@
  * This page handles logins for nonuser calendars.
  */
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/publish.php b/publish.php
@@ -24,14 +24,14 @@
  */
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/register.php b/register.php
@@ -5,14 +5,14 @@
 unset ( $_SESSION['webcalendar_session'] );
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/rss.php b/rss.php
@@ -44,34 +44,31 @@
  *
  * We do not include unapproved events in the RSS feed.
  *
- *
  * TODO
  * Add other RSS 2.0 options such as media.
  * Add <managingEditor>: dan@spam_me.com (Dan Deletekey)
  */
 
 $debug = false;
 
-include_once 'includes/translate.php';
+require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 require_once 'includes/classes/Event.php';
 require_once 'includes/classes/RptEvent.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
 
-include 'includes/formvars.php';
-include 'includes/functions.php';
-include 'includes/config.php';
-include 'includes/dbi4php.php';
+require_once 'includes/formvars.php';
+require_once 'includes/config.php';
+require_once 'includes/dbi4php.php';
 
 $WebCalendar->initializeFirstPhase();
 
-include 'includes/' . $user_inc;
-
+require_once "includes/$user_inc";
 include_once 'includes/validate.php';
-include 'includes/site_extras.php';
-
-include_once 'includes/xcal.php';
+require_once 'includes/site_extras.php';
+require_once 'includes/xcal.php';
 
 $WebCalendar->initializeSecondPhase();
 

diff --git a/rss_activity_log.php b/rss_activity_log.php
@@ -34,6 +34,7 @@
  */
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
@@ -42,7 +43,6 @@
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/rss_unapproved.php b/rss_unapproved.php
@@ -33,6 +33,7 @@
  */
 
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar( __FILE__ );
@@ -41,7 +42,6 @@
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();
 

diff --git a/users_ajax.php b/users_ajax.php
@@ -5,14 +5,14 @@
  *   and remotecal_mgmt.php.
  */
 require_once 'includes/translate.php';
+require_once 'includes/functions.php';
 require_once 'includes/classes/WebCalendar.php';
 
 $WebCalendar = new WebCalendar(__FILE__);
 
 require_once 'includes/config.php';
 require_once 'includes/dbi4php.php';
 require_once 'includes/formvars.php';
-require_once 'includes/functions.php';
 
 $WebCalendar->initializeFirstPhase();