- Introduction
@@ -340,7 +340,7 @@
Events may be associated with one or more categories, but it is not required. Categories can be user-level or global. Each user maintains his/her own list of user-level categories, while the system administrator maintains the list of global categories.
When creating or editing event, you may specify the categories for the event. If the category you select isn't a global category, and you select participants other than yourself for that event, other users will see "None" as the category. If you selected a global category, all users will be able to see the same category.
When viewing the calendar (month, week or day), a selection box is displayed near the top of the page that allows you to filter events based on a category. When you select a category from this menu, only events associated with that category will appear on your calendar.
- If enabled, icons can also be uploaded and assigned to categories to be displayed before the event name. You will also be able to choose an icon from existing icons that have already been uploaded. This requires that a folder named icons exist in the WebCalendar directory.
+ If enabled, icons can also be uploaded and assigned to categories to be displayed before the event name. You will also be able to choose an icon from existing icons that have already been uploaded. This requires that a folder named icons exist in the WebCalendar directory.
↑ top
diff --git a/edit_entry.php b/edit_entry.php
index a336ab430..8677ac6b5 100644
--- a/edit_entry.php
+++ b/edit_entry.php
@@ -150,7 +150,7 @@ function time_selection($prefix, $time = '', $trigger = false)
$real_user = ((!empty($user) && strlen($user)) &&
($is_assistant || $is_admin)) ? $user : $login;
-print_header($INC, $HEAD, $BodyX);
+print_header ( $INC, $HEAD, $BodyX );
if ($readonly == 'Y' || $is_nonuser)
$can_edit = false;
@@ -368,7 +368,7 @@ function time_selection($prefix, $time = '', $trigger = false)
if (!empty($cat_id)) {
$res = dbi_execute(
'SELECT cat_name FROM webcal_categories ' .
- 'WHERE cat_id = ? AND ( cat_owner = ? OR cat_owner IS NULL )',
+ 'WHERE cat_id = ? AND ( cat_owner = ? OR cat_owner = \'\' )',
[$cat_id, $real_user]
);
if ($res) {
diff --git a/edit_remotes_handler.php b/edit_remotes_handler.php
index 5899c4e05..860e8c878 100644
--- a/edit_remotes_handler.php
+++ b/edit_remotes_handler.php
@@ -130,7 +130,7 @@ function_exists ( 'simplexml_load_string' ) ) {
$errorStr = '
' . translate ( 'Error' ) . ': ';
- print_header ( '', '', '', true, false, true );
+ print_header ( [], '', '', true, false, true );
if ( count ( $data ) && empty ( $errormsg ) ) {
// Delete existing events.
delete_events ( $nid );
diff --git a/edit_report.php b/edit_report.php
index ec18cbbf4..49eefaba9 100644
--- a/edit_report.php
+++ b/edit_report.php
@@ -11,8 +11,8 @@
* @author Craig Knudsen
* @copyright Craig Knudsen, , http://k5n.us/webcalendar
* @license https://gnu.org/licenses/old-licenses/gpl-2.0.html GNU GPL
- * @package WebCalendar
- * @subpackage Reports
+ *
+ * @package WebCalendar\Reports
*/
/* Security:
diff --git a/edit_report_handler.php b/edit_report_handler.php
index b4d2575b7..52c72587b 100644
--- a/edit_report_handler.php
+++ b/edit_report_handler.php
@@ -150,24 +150,13 @@
$names[] = 'cal_report_id';
$values[] = $newid;
- $sql = 'INSERT INTO webcal_report ( ';
- $sql_v = '';
-
- $namecnt = count ( $names );
- for ( $i = 0; $i < $namecnt; $i++ ) {
- $sql .= ( $i > 0 ? ', ' : '' ) . $names[$i];
- $sql_v .= ( $i > 0 ? ', ' : '' ) . '?';
- }
- $sql .= ' ) VALUES ( ' . $sql_v . ' )';
+ $sql = 'INSERT INTO webcal_report ( ' . implode ( ',', $names )
+ . ' ) VALUES ( ?' . str_repeat ( ',?', count ( $names ) - 1 ) . ' )';
$report_id = $newid;
} else {
- $sql = 'UPDATE webcal_report SET ';
- $namecnt = count ( $names );
- for ( $i = 0; $i < $namecnt; $i++ ) {
- $sql .= ( $i > 0 ? ', ' : '' ) . "$names[$i] = ?";
- }
- $sql .= ' WHERE cal_report_id = ?';
- $values[] = $report_id; // Push the $report_id to $values.
+ $sql = 'UPDATE webcal_report SET ' . implode ( ' = ?,', $names )
+ . ' = ? WHERE cal_report_id = ?';
+ $values[] = $report_id;
}
}
diff --git a/edit_template.php b/edit_template.php
index eef7631ab..ae6f8c84e 100644
--- a/edit_template.php
+++ b/edit_template.php
@@ -101,7 +101,7 @@
}
}
-print_header ( '', '', '', true );
+print_header ( [], '', '', true );
/*
echo 'report_id: ' . $report_id . '
report_name: ' . $report_name . '
diff --git a/export.php b/export.php
index a6a7f733a..62be94c89 100644
--- a/export.php
+++ b/export.php
@@ -19,11 +19,11 @@
$datem = date ( 'm' );
$dateY = date ( 'Y' );
-$yearAgo = time () - 365 * 24 * 3600;
+$yearAgo = time () - 31536000; // 365 * 24 * 3600;
$dateYearAgo = date('Ymd', $yearAgo);
$selected = ' selected ';
-print_header('', '', 'onload="updateDateFields();"' );
+print_header ( [], '', 'onload="updateDateFields();"' );
echo '' . translate ( 'Export' ) . '