From 253d4b48ec708eb42033862dc15c8576f44a48ed Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 1 Oct 2014 15:32:05 +0200 Subject: more PHPDocs, unused var, small bit code reformatting --- install.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'install.php') diff --git a/install.php b/install.php index 767dd332f..71c2457dc 100644 --- a/install.php +++ b/install.php @@ -160,6 +160,8 @@ header('Content-Type: text/html; charset=utf-8'); /** * Print the input form + * + * @param array $d submitted entry 'd' of request data */ function print_form($d){ global $lang; @@ -265,6 +267,9 @@ function print_retry() { * Check validity of data * * @author Andreas Gohr + * + * @param array $d + * @return bool ok? */ function check_data(&$d){ static $form_default = array( @@ -334,6 +339,9 @@ function check_data(&$d){ * Writes the data to the config files * * @author Chris Smith + * + * @param array $d + * @return bool */ function store_data($d){ global $LC; @@ -438,6 +446,10 @@ EOT; * Write the given content to a file * * @author Chris Smith + * + * @param string $filename + * @param string $data + * @return bool */ function fileWrite($filename, $data) { global $error; @@ -460,6 +472,8 @@ function fileWrite($filename, $data) { * unmodified main config file * * @author Chris Smith + * + * @return bool */ function check_configs(){ global $error; @@ -498,6 +512,8 @@ function check_configs(){ * Check other installation dir/file permission requirements * * @author Chris Smith + * + * @return bool */ function check_permissions(){ global $error; @@ -533,6 +549,8 @@ function check_permissions(){ * Check the availability of functions used in DokuWiki and the PHP version * * @author Andreas Gohr + * + * @return bool */ function check_functions(){ global $error; @@ -626,6 +644,8 @@ function print_errors(){ * remove magic quotes recursivly * * @author Andreas Gohr + * + * @param array $array */ function remove_magic_quotes(&$array) { foreach (array_keys($array) as $key) { -- cgit v1.2.3 From 001d05eda158fd1c33cd0e6580a28241af69226c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 14 Oct 2014 21:32:54 +0200 Subject: new PHP minimum requirement is now 5.3.3 that's the version in Debian old stable --- install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index c8bc68ef9..d13a5eaab 100644 --- a/install.php +++ b/install.php @@ -538,8 +538,8 @@ function check_functions(){ global $lang; $ok = true; - if(version_compare(phpversion(),'5.2.0','<')){ - $error[] = sprintf($lang['i_phpver'],phpversion(),'5.2.0'); + if(version_compare(phpversion(),'5.3.3','<')){ + $error[] = sprintf($lang['i_phpver'],phpversion(),'5.3.3'); $ok = false; } -- cgit v1.2.3 From 79e79377626799a77c11aa7849cb9c64305590c8 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 7 Jan 2015 10:47:45 +0100 Subject: Remove error supression for file_exists() In an older version of PHP a file_exists() call would issue a warning when the file did not exist. This was fixed in later PHP releases. Since we require PHP 5.3 now, there's no need to supress any error here anymore. This might even give a minor performance boost. --- install.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index d031cb3d9..1a2d03dff 100644 --- a/install.php +++ b/install.php @@ -110,7 +110,7 @@ header('Content-Type: text/html; charset=utf-8');
\n"; @@ -497,7 +497,7 @@ function check_configs(){ // configs shouldn't exist foreach ($config_files as $file) { - if (@file_exists($file) && filesize($file)) { + if (file_exists($file) && filesize($file)) { $file = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}/', $file); $error[] = sprintf($lang['i_confexists'],$file); $ok = false; @@ -535,7 +535,7 @@ function check_permissions(){ $ok = true; foreach($dirs as $dir){ - if(!@file_exists("$dir/.") || !@is_writable($dir)){ + if(!file_exists("$dir/.") || !is_writable($dir)){ $dir = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}', $dir); $error[] = sprintf($lang['i_permfail'],$dir); $ok = false; @@ -604,7 +604,7 @@ function langsel(){ $langs = array(); while (($file = readdir($dh)) !== false) { if(preg_match('/^[\._]/',$file)) continue; - if(is_dir($dir.'/'.$file) && @file_exists($dir.'/'.$file.'/lang.php')){ + if(is_dir($dir.'/'.$file) && file_exists($dir.'/'.$file.'/lang.php')){ $langs[] = $file; } } -- cgit v1.2.3 From ae614416a5d7f5cab6c5b82a0c45f587d7fa9c01 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 12 Jul 2015 19:05:43 +0100 Subject: changed all input type=submit buttons to button type=submit button for better stylability --- install.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index 1a2d03dff..4de8093d6 100644 --- a/install.php +++ b/install.php @@ -243,7 +243,7 @@ function print_form($d){
- +
- +
'.$l.''; } echo ' '; - echo ''; + echo ''; echo ''; } -- cgit v1.2.3 From a060d9973e7c1d5051f2cc426937881826e4972e Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Mon, 10 Aug 2015 10:01:56 +0200 Subject: Release preparation --- install.php | 1 + 1 file changed, 1 insertion(+) (limited to 'install.php') diff --git a/install.php b/install.php index 4de8093d6..6002ec88c 100644 --- a/install.php +++ b/install.php @@ -58,6 +58,7 @@ $dokuwiki_hash = array( '2013-05-10' => '7b62b75245f57f122d3e0f8ed7989623', '2013-12-08' => '263c76af309fbf083867c18a34ff5214', '2014-05-05' => '263c76af309fbf083867c18a34ff5214', + '2015-08-10' => '263c76af309fbf083867c18a34ff5214' ); -- cgit v1.2.3