# HG changeset patch # User Matti Hamalainen # Date 1504215771 -10800 # Node ID 3ee66c43208163e98cf68d245951fa6e4e900319 # Parent e14605c7aea0e80c76cc7a826dc4a5aa0bb29161 Use modern PHP array syntax. diff -r e14605c7aea0 -r 3ee66c432081 mgallery.inc.php --- a/mgallery.inc.php Mon Aug 28 13:49:10 2017 +0300 +++ b/mgallery.inc.php Fri Sep 01 00:42:51 2017 +0300 @@ -53,45 +53,46 @@ // // Configuration settings and their default values // -$mgDefaults = array( - "base_path" => array(MG_STR, mgPathName(mgRealPath($_SERVER["SCRIPT_FILENAME"]))), - "base_url" => array(MG_STR, mgPathName($_SERVER["PHP_SELF"])), - "image_url" => array(MG_STR, mgPathName($_SERVER["PHP_SELF"])), - "mgallery_php" => array(MG_STR, "mgallery.php"), - "format_exts" => array(MG_STR, "\.jpg|\.png|\.gif|\.jpeg"), - "captions_file" => array(MG_STR, "captions.txt"), - "header_file" => array(MG_STR, "header.txt"), - "info_file" => array(MG_STR, "gallery.info"), - "cache_file" => array(MG_STR, ".mgallery.cache"), +$mgDefaults = [ - "cover_images" => array(MG_BOOL, TRUE), - "use_tables" => array(MG_BOOL, TRUE), - "clean_urls" => array(MG_BOOL, FALSE), + "base_path" => [MG_STR, mgPathName(mgRealPath($_SERVER["SCRIPT_FILENAME"]))], + "base_url" => [MG_STR, mgPathName($_SERVER["PHP_SELF"])], + "image_url" => [MG_STR, mgPathName($_SERVER["PHP_SELF"])], + "mgallery_php" => [MG_STR, "mgallery.php"], + "format_exts" => [MG_STR, "\.jpg|\.png|\.gif|\.jpeg"], + "captions_file" => [MG_STR, "captions.txt"], + "header_file" => [MG_STR, "header.txt"], + "info_file" => [MG_STR, "gallery.info"], + "cache_file" => [MG_STR, ".mgallery.cache"], + + "cover_images" => [MG_BOOL, TRUE], + "use_tables" => [MG_BOOL, TRUE], + "clean_urls" => [MG_BOOL, FALSE], - "title_prefix" => array(MG_STR, ""), - "title_sep" => array(MG_STR, " - "), - "page_info" => array(MG_STR, "MGallery ".$mgProgVersion." © Copyright ".$mgProgCopyright), - "css_select" => array(MG_BOOL, FALSE), - "css" => array(MG_STR, NULL), - "urchin_file" => array(MG_STR, FALSE), - "album_icon" => array(MG_STR, "album_sm.png"), + "title_prefix" => [MG_STR, ""], + "title_sep" => [MG_STR, " - "], + "page_info" => [MG_STR, "MGallery ".$mgProgVersion." © Copyright ".$mgProgCopyright], + "css_select" => [MG_BOOL, FALSE], + "css" => [MG_STR, NULL], + "urchin_file" => [MG_STR, FALSE], + "album_icon" => [MG_STR, "album_sm.png"], - "global_flags" => array(MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS | MGF_CAPTIONS, &$mgGFlags), - "image_flags" => array(MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS, &$mgGFlags), - "album_flags" => array(MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS, &$mgGFlags), - "album_row_limit" => array(MG_INT, 5), + "global_flags" => [MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS | MGF_CAPTIONS, &$mgGFlags], + "image_flags" => [MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS, &$mgGFlags], + "album_flags" => [MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS, &$mgGFlags], + "album_row_limit" => [MG_INT, 5], - "med_suffix" => array(MG_STR, ".med"), - "tn_path" => array(MG_STR, "tn/"), + "med_suffix" => [MG_STR, ".med"], + "tn_path" => [MG_STR, "tn/"], - "tn_width" => array(MG_INT, 140), // In pixels, applies as bounding box for w/h - "tn_height" => array(MG_INT, 100), - "tn_quality" => array(MG_INT, 77), // JPEG quality percent + "tn_width" => [MG_INT, 140], // In pixels, applies as bounding box for w/h + "tn_height" => [MG_INT, 100], + "tn_quality" => [MG_INT, 77], // JPEG quality percent - "med_width" => array(MG_INT, 960), - "med_height" => array(MG_INT, 640), - "med_quality" => array(MG_INT, 88), -); + "med_width" => [MG_INT, 960], + "med_height" => [MG_INT, 640], + "med_quality" => [MG_INT, 88], +]; function mgDebug($msg) @@ -193,7 +194,7 @@ { global $mgSettings, $mgDefaults; - $spaths = array(); + $spaths = []; $spaths[] = getcwd()."/"; if (($tmp = getenv("HOME")) !== FALSE && strlen($tmp) > 0) { @@ -235,7 +236,7 @@ } } - $mgSettings = array(); + $mgSettings = []; return FALSE; } @@ -248,7 +249,7 @@ function mgCleanPathArray($refs, $start, $argc, $argv) { - $path = array(); + $path = []; $first = TRUE; for ($n = $start; $n < $argc; $n++) {