PHP8 changes and misc fixes

craigk5n · Sep 7, 2023 · 1389b61 · 1389b61
1 parent d0572ba
commit 1389b61
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 26 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -32,4 +32,4 @@ jobs:
           context: .
           file: ./docker/Dockerfile-php8
           push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/webcalendar:v1.9.6-dev-php8
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/webcalendar:v1.9.7-dev-php8
diff --git a/UPGRADING.html b/UPGRADING.html
@@ -11,7 +11,7 @@ <h1>WebCalendar Upgrading Notes</h1>
     <table>
       <tr>
         <th>WebCalendar Version:</th>
-        <td>1.9.6</td>
+        <td>1.9.7</td>
       </tr>
     </table>
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "k5n/webcalendar",
   "type": "project",
   "description": "Multi-user web-based calendar app",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "homepage": "https://www.k5n.us/webcalendar/",
   "authors": [
     {

diff --git a/day.php b/day.php
@@ -10,7 +10,8 @@
 
 load_user_categories();
 
-$wday = strftime ( '%w', mktime ( 0, 0, 0, $thismonth, $thisday, $thisyear ) );
+$thisdate = new DateTime("$thisyear-$thismonth-$thisday");
+$wday = $thisdate->format('w');
 $now = mktime ( 23, 59, 59, $thismonth, $thisday, $thisyear );
 $nowYmd = date ( 'Ymd', $now );
 

diff --git a/includes/config.php b/includes/config.php
@@ -161,9 +161,9 @@ function do_config()
   ];
 
   // When changing PROGRAM VERSION, also change it in install/default_config.php
-  $PROGRAM_VERSION = 'v1.9.6';
+  $PROGRAM_VERSION = 'v1.9.7';
   // Update PROGRAM_DATE with official release data
-  $PROGRAM_DATE = '30 Aug 2023';
+  $PROGRAM_DATE = '07 Sep 2023';
 
   $PROGRAM_NAME = 'WebCalendar ' . "$PROGRAM_VERSION ($PROGRAM_DATE)";
   $PROGRAM_URL = 'http://k5n.us/wp/webcalendar/';

diff --git a/includes/functions.php b/includes/functions.php
@@ -987,8 +987,9 @@ function display_activity_log( $cal_type, $cal_text = '', $break = '<br>&nbsp;'
   else
     $ret = '???';
   //fix any broken special characters
-  $cal_text = preg_replace( "/&amp;(#[0-9]+|[a-z]+);/i", "&$1;",
-    htmlentities( $cal_text ) );
+  if (!empty($cal_text)) {
+    $cal_text = preg_replace("/&amp;(#[0-9]+|[a-z]+);/i", "&$1;", htmlentities($cal_text));
+  }
   return $ret
    . ( empty ( $cal_text ) ? '' : $break . $cal_text );
 }

diff --git a/install/default_config.php b/install/default_config.php
@@ -151,7 +151,7 @@
   'USER_RSS_ENABLED' => 'N',
   'USER_SEES_ONLY_HIS_GROUPS' => 'Y',
   'USER_SORT_ORDER' => 'cal_lastname, cal_firstname',
-  'WEBCAL_PROGRAM_VERSION' => 'v1.9.6',
+  'WEBCAL_PROGRAM_VERSION' => 'v1.9.7',
   'WEEK_START' => '0',
   'WEEKEND_START' => '6',
   'WEEKENDBG' => '#d0d0d0',

diff --git a/install/index.php b/install/index.php
@@ -193,7 +193,6 @@
     . '\' ); document.go(-1)">';
     // Invalid password.
     echo '<br>' . translate( 'Password Incorrect' ) . '</title></head><body>' . translate( 'Password Incorrect' );
-    echo "Password: '$pwd' <br> md5 = " . md5($pwd) . "<br>envpwd = " . $envpwd;
     echo '</body></html>';
     exit;
   }

diff --git a/install/sql/upgrade-db2.sql b/install/sql/upgrade-db2.sql
@@ -300,4 +300,4 @@ ALTER TABLE webcal_user MODIFY cal_passwd VARCHAR(255);
 /*upgrade_v1.9.5*/
 update webcal_entry_categories SET cat_owner = '' WHERE cat_owner IS NULL;
 ALTER TABLE webcal_entry_categories ADD PRIMARY KEY (cal_id, cat_id, cat_order, cat_owner);
-/*upgrade_v1.9.6*/
+/*upgrade_v1.9.7*/
diff --git a/install/sql/upgrade-ibase.sql b/install/sql/upgrade-ibase.sql
@@ -315,4 +315,4 @@ ALTER TABLE webcal_user MODIFY cal_passwd VARCHAR(255);
 /*upgrade_v1.9.5*/
 update webcal_entry_categories SET cat_owner = '' WHERE cat_owner IS NULL;
 ALTER TABLE webcal_entry_categories ADD PRIMARY KEY (cal_id, cat_id, cat_order, cat_owner);
-/*upgrade_v1.9.6*/
+/*upgrade_v1.9.7*/
diff --git a/install/sql/upgrade-mssql.sql b/install/sql/upgrade-mssql.sql
@@ -301,4 +301,4 @@ ALTER TABLE webcal_user MODIFY cal_passwd VARCHAR(255);
 /*upgrade_v1.9.5*/
 update webcal_entry_categories SET cat_owner = '' WHERE cat_owner IS NULL;
 ALTER TABLE webcal_entry_categories ADD PRIMARY KEY (cal_id, cat_id, cat_order, cat_owner);
-/*upgrade_v1.9.6*/
+/*upgrade_v1.9.7*/
diff --git a/install/sql/upgrade-mysql.sql b/install/sql/upgrade-mysql.sql
@@ -270,4 +270,4 @@ ALTER TABLE webcal_user MODIFY cal_passwd VARCHAR(255);
 /*upgrade_v1.9.5*/
 update webcal_entry_categories SET cat_owner = '' WHERE cat_owner IS NULL;
 ALTER TABLE webcal_entry_categories ADD PRIMARY KEY (cal_id, cat_id, cat_order, cat_owner);
-/*upgrade_v1.9.6*/
+/*upgrade_v1.9.7*/
diff --git a/install/sql/upgrade-oracle.sql b/install/sql/upgrade-oracle.sql
@@ -298,4 +298,4 @@ ALTER TABLE webcal_user MODIFY cal_passwd VARCHAR(255);
 /*upgrade_v1.9.5*/
 update webcal_entry_categories SET cat_owner = '' WHERE cat_owner IS NULL;
 ALTER TABLE webcal_entry_categories ADD PRIMARY KEY (cal_id, cat_id, cat_order, cat_owner);
-/*upgrade_v1.9.6*/
+/*upgrade_v1.9.7*/
diff --git a/install/sql/upgrade-postgres.sql b/install/sql/upgrade-postgres.sql
@@ -316,4 +316,4 @@ ALTER TABLE webcal_user MODIFY cal_passwd VARCHAR(255);
 /*upgrade_v1.9.5*/
 update webcal_entry_categories SET cat_owner = '' WHERE cat_owner IS NULL;
 ALTER TABLE webcal_entry_categories ADD PRIMARY KEY (cal_id, cat_id, cat_order, cat_owner);
-/*upgrade_v1.9.6*/
+/*upgrade_v1.9.7*/
diff --git a/install/sql/upgrade.sql b/install/sql/upgrade.sql
@@ -616,4 +616,4 @@ ALTER TABLE webcal_user MODIFY cal_passwd VARCHAR(255);
 /*upgrade_v1.9.5*/
 update webcal_entry_categories SET cat_owner = '' WHERE cat_owner IS NULL;
 ALTER TABLE webcal_entry_categories ADD PRIMARY KEY (cal_id, cat_id, cat_order, cat_owner);
-/*upgrade_v1.9.6*/
+/*upgrade_v1.9.7*/
diff --git a/install/sql/upgrade_matrix.php b/install/sql/upgrade_matrix.php
@@ -1,6 +1,6 @@
 <?php
 //Program Version for this release
-$PROGRAM_VERSION = 'v1.9.6';
+$PROGRAM_VERSION = 'v1.9.7';
 
 //array element[0] = sql insertion testy
 //array element[1] = sql delete to clean up

diff --git a/login.php b/login.php
@@ -257,13 +257,5 @@
 }
 ?>
 </div>
-
-<?php
-// TODO use variable from init.php for these version numbers
-?>
-<!--
-<script src="vendor/twbs/bootstrap/dist/js/ootstrap.min.js"></script>
-<script src="vendor/twbs/bootstrap/js/dist/index.js"></script>
--->
 </body>
 </html>