might help with login & not-authorized errors

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();
 

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();
 

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();
 

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();
 

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();
 

includes/functions.php

@@ -796,41 +796,31 @@ function date_selection($prefix, $date, $trigger = false, $num_years = 20)
 }
 
 /**
- * Converts a date to a timestamp.
+ * date_to_epoch
  *
- * @param string $d   Date in YYYYMMDD or YYYYMMDDHHIISS format
- * @param bool   $gmt Whether to use GMT or LOCAL
+ * Converts a date to a timestamp
  *
- * @return int  Timestamp representing, in UTC or LOCAL time.
+ * @param  mixed  $d    Date in YYYYMMDD or YYYYMMDDHHIISS format
+ * @param  bool   $gmt  Whether to use GMT or LOCAL
+ *
+ * @return int timestamp representing, in UTC or LOCAL time
  */
-function date_to_epoch( $d, $gmt = true ) {
-  if ( $d == 0 || $d === '' )
+function date_to_epoch ( $d, $gmt = true ) {
+  if ( ! $d ) {
     return 0;
-
-  $dH = $di = $ds = 0;
-  if ( strlen ( $d ) == 13 ) { // Hour value is single digit.
-    $dH = substr ( $d, 8, 1 );
-    $di = substr ( $d, 9, 2 );
-    $ds = substr ( $d, 11, 2 );
-  }
-  if ( strlen ( $d ) == 14 ) {
-    $dH = substr ( $d, 8, 2 );
-    $di = substr ( $d, 10, 2 );
-    $ds = substr ( $d, 12, 2 );
   }
 
-  if ( $gmt )
-    return gmmktime ( $dH, $di, $ds,
-      (int)substr ( $d, 4, 2 ),
-      (int)substr ( $d, 6, 2 ),
-      (int)substr ( $d, 0, 4 ) );
-  else
-    return mktime ( $dH, $di, $ds,
-      (int)substr ( $d, 4, 2 ),
-      (int)substr ( $d, 6, 2 ),
-      (int)substr ( $d, 0, 4 ) );
-}
+  $f = ( $gmt ? 'gm' : '' ) . 'mktime';
 
+  return $f (
+    (int) mb_substr ( $d, 8, ( mb_strlen ( $d ) === 13 ? 1 : 2 ) ),
+    (int) mb_substr ( $d, -4, 2 ),
+    (int) mb_substr ( $d, -2, 2 ),
+    (int) mb_substr ( $d, 4, 2 ),
+    (int) mb_substr ( $d, 6, 2 ),
+    (int) mb_substr ( $d, 0, 4 )
+  );
+}
 
 /**
  * Converts a date in YYYYMMDD format into "Friday, December 31, 1999",

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();
 

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();
 

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();
 

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();

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();
 

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();
 

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();
 

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;
-
-include_once 'includes/validate.php';
-include 'includes/site_extras.php';
-
-include_once 'includes/xcal.php';
+require_once "includes/$user_inc";
+require_once 'includes/validate.php';
+require_once 'includes/site_extras.php';
+require_once 'includes/xcal.php';
 
 $WebCalendar->initializeSecondPhase();
 

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();
 

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();
 

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();