diff --git a/Readme b/Readme index 5bdadf12..1e2377a7 100644 --- a/Readme +++ b/Readme @@ -39,7 +39,9 @@ Post any bugs to https://github.com/pellcorp/opendb/issues - phpSniff - Copyright 2002-2004 Roger Raymond -- phpThumb() - The PHP thumbnail creator. by James Heinrich +- phpThumb() - The PHP thumbnail creator by James Heinrich + +- PHPMailer - 5.2.x - https://github.com/PHPMailer/PHPMailer - adodb-time.inc.php - ADODb Date / Time functions. Copyright (c) 2000, 2001, 2002, 2003 John Lim diff --git a/admin.php b/admin.php index 94f07ad8..e7e95290 100644 --- a/admin.php +++ b/admin.php @@ -37,7 +37,7 @@ if (is_site_enabled()) { if (is_opendb_valid_session()) { if (is_user_granted_permission(PERM_ADMIN_TOOLS)) { - $HTTP_VARS['type'] = ifempty($HTTP_VARS['type'], 'config'); + $HTTP_VARS['type'] = ifempty($HTTP_VARS['type'] ?? NULL, 'config'); $ADMIN_TYPE = $HTTP_VARS['type']; $ADMIN_DIR = './admin/' . $ADMIN_TYPE; @@ -67,7 +67,7 @@ _theme_header($title); // todo - this should really be in the ... - does it matter? - if ($xajax) { + if (isset($xajax)) { $xajax->printJavascript(); } @@ -92,4 +92,4 @@ // Cleanup after begin.inc.php require_once("./include/end.inc.php"); -?> \ No newline at end of file +?> diff --git a/admin/backup/index.php b/admin/backup/index.php index 8b587434..7bf78d29 100644 --- a/admin/backup/index.php +++ b/admin/backup/index.php @@ -106,13 +106,13 @@ function get_table_content($table, $crlf) { unset($HTTP_VARS['tables']); $opendb_tables_r = fetch_opendb_table_list_r(); - while (list(, $value) = each($opendb_tables_r)) { + foreach ($opendb_tables_r as $value) { $HTTP_VARS['tables'][] = $value; } } @reset($HTTP_VARS['tables']); - while (list(, $table) = @each($HTTP_VARS['tables'])) { + foreach ($HTTP_VARS['tables'] as $table) { echo $CRLF . "#" . $CRLF; echo "# " . get_opendb_lang_var('dumping_data_for_table', 'table', $table) . $CRLF; echo "#" . $CRLF . $CRLF; @@ -126,7 +126,8 @@ function get_table_content($table, $crlf) { echo ("
    "); $opendb_tables_r = fetch_opendb_table_list_r(); - while (list(, $table) = each($opendb_tables_r)) { + $count = 0; + foreach ($opendb_tables_r as $table) { // the cache tables cannot be backed up as they might contain // binary data, which we don't yet support. if (!ends_with($table, '_cache') && $table != 'php_session') { @@ -150,4 +151,4 @@ function get_table_content($table, $crlf) { echo (" "); } -?> \ No newline at end of file +?> diff --git a/admin/config/index.php b/admin/config/index.php index d3fb45e2..6f447443 100755 --- a/admin/config/index.php +++ b/admin/config/index.php @@ -116,7 +116,7 @@ function get_group_block_input_field($config_group_item_r, $value) { if (is_array($value)) { reset($value); - while (list($key, $val) = each($value)) { + foreach ($value as $key => $val) { $buffer .= "