Enano CMS (1.1.x): comparison install/includes/cli-core.php

equal deleted inserted replaced

-:0b7ff06aad13
+:f3a5a276208c
 installer_fail('Enano is already installed. Uninstall it by deleting config.php and creating a blank file called config.new.php.');
 }
 // parse command line args
-foreach ( array('silent', 'driver', 'dbhost', 'dbuser', 'dbpasswd', 'dbname', 'db_prefix', 'user', 'pass', 'email', 'sitename', 'sitedesc', 'copyright', 'urlscheme', 'lang_id', 'scriptpath') as $var )
+foreach ( array('silent', 'driver', 'dbhost', 'dbport', 'dbuser', 'dbpasswd', 'dbname', 'db_prefix', 'user', 'pass', 'email', 'sitename', 'sitedesc', 'copyright', 'urlscheme', 'lang_id', 'scriptpath') as $var )
 {
 if ( !isset($$var) )
 {
 $$var = false;
 }
 $driver = @$argv[++$i];
 break;
 case '--db-host':
 case '-h':
 $dbhost = @$argv[++$i];
+break;
+case '--db-port':
+case '-o':
+$dbport = @$argv[++$i];
 break;
 case '--db-user':
 case '-u':
 $dbuser = @$argv[++$i];
 break;
 [-d database] [-a adminuser] [-w adminpass] [-e email]
 All arguments are optional; missing information will be prompted for.
 -q                Quiet mode (minimal output)
 -b, --db-driver   Database driver (mysql or postgresql)
 -h, --db-host     Hostname of database server
+-o, --db-port     TCP port on which to connect to database server
 -u, --db-user     Username to use on database server
 -p, --db-pass     Password to use on database server
 -d, --db-name     Name of database
 -a, --admin-user  Administrator username
 -w, --admin-pass  Administrator password
 }
 $defaults = array(
 'driver'  => 'mysql',
 'dbhost'    => 'localhost',
+'dbport'    => 3306,
 'dbuser'    => false,
 'dbpasswd'  => false,
 'dbname'    => false,
 'db_prefix'    => '',
 'user'      => 'admin',
 );
 $terms = array(
 'driver'  => $lang->get('cli_prompt_driver'),
 'dbhost'    => $lang->get('cli_prompt_dbhost'),
+'dbport'    => $lang->get('cli_prompt_dbport'),
 'dbuser'    => $lang->get('cli_prompt_dbuser'),
 'dbpasswd'  => $lang->get('cli_prompt_dbpasswd'),
 'dbname'    => $lang->get('cli_prompt_dbname'),
 'db_prefix'    => $lang->get('cli_prompt_db_prefix'),
 'user'      => $lang->get('cli_prompt_user'),
 'copyright' => $lang->get('cli_prompt_copyright'),
 'urlscheme' => $lang->get('cli_prompt_urlscheme'),
 'scriptpath'=> $lang->get('cli_prompt_scriptpath')
 );
-foreach ( array('driver', 'dbhost', 'dbuser', 'dbpasswd', 'dbname', 'db_prefix', 'scriptpath', 'user', 'pass', 'email', 'sitename', 'sitedesc', 'copyright', 'urlscheme') as $var )
+$defaults['dbport'] = ( strtolower($driver) == 'postgresql' ) ? 5432 : 3306;
+foreach ( array('driver', 'dbhost', 'dbport', 'dbuser', 'dbpasswd', 'dbname', 'db_prefix', 'scriptpath', 'user', 'pass', 'email', 'sitename', 'sitedesc', 'copyright', 'urlscheme') as $var )
 {
 if ( empty($$var) )
 {
 switch($var)
 {
 default:
 $$var = cli_prompt($terms[$var], $defaults[$var]);
+break;
+case 'driver':
+$$var = cli_prompt($terms[$var], $defaults[$var]);
+$defaults['dbport'] = ( strtolower($driver) == 'postgresql' ) ? 5432 : 3306;
 break;
 case 'pass':
 case 'dbpasswd':
 if ( @file_exists('/bin/stty') && @is_executable('/bin/stty') )
 {
 while ( !preg_match('/^[a-z0-9_]*$/', $$var) )
 {
 $$var = cli_prompt($terms[$var], $defaults[$var]);
 }
 break;
+case 'dbport':
+$$var = cli_prompt($terms[$var], strval($defaults[$var]));
+while ( !preg_match('/^[0-9]*$/', $$var) )
+{
+$$var = cli_prompt($terms[$var], $defaults[$var]);
+}
+$$var = intval($$var);
+break;
 }
 }
 }
 ##
 $dbal = new $driver();
 if ( !$silent )
 echo parse_shellcolor_string($lang->get('cli_msg_testing_db'));
-$result = $dbal->connect(true, $dbhost, $dbuser, $dbpasswd, $dbname);
+$result = $dbal->connect(true, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport);
 if ( !$result )
 {
 if ( !$silent )
 {
 echo parse_shellcolor_string($lang->get('cli_test_fail')) . "\n";
 if ( !$silent )
 {
 echo parse_shellcolor_string($lang->get('cli_stage_sysreqs'));
 }
-$test_failed = false;
+$failed = false;
+$warnings = array();
-run_test('return version_compare(\'5.2.0\', PHP_VERSION, \'<=\');', $lang->get('sysreqs_req_php5'), $lang->get('sysreqs_req_desc_php5'), true);
-run_test('return function_exists(\'mysql_connect\');', $lang->get('sysreqs_req_mysql'), $lang->get('sysreqs_req_desc_mysql'), true);
+// Test: PHP
-run_test('return function_exists(\'pg_connect\');', $lang->get('sysreqs_req_postgres'), $lang->get('sysreqs_req_desc_postgres'), true);
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_php') . ': ';
-run_test('return @ini_get(\'file_uploads\');', $lang->get('sysreqs_req_uploads'), $lang->get('sysreqs_req_desc_uploads') );
+if ( version_compare(PHP_VERSION, '5.2.0', '>=') )
-run_test('return config_write_test();', $lang->get('sysreqs_req_config'), $lang->get('sysreqs_req_desc_config') );
+{
-run_test('return file_exists(\'/usr/bin/convert\');', $lang->get('sysreqs_req_magick'), $lang->get('sysreqs_req_desc_magick'), true);
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_pass')) . "\n";
-run_test('return is_writable(ENANO_ROOT.\'/cache/\');', $lang->get('sysreqs_req_cachewriteable'), $lang->get('sysreqs_req_desc_cachewriteable'), true);
+}
-run_test('return is_writable(ENANO_ROOT.\'/files/\');', $lang->get('sysreqs_req_fileswriteable'), $lang->get('sysreqs_req_desc_fileswriteable'), true);
+else if ( version_compare(PHP_VERSION, '5.0.0', '>=') )
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_vwarn')) . "\n";
+$warnings[] = $lang->get('sysreqs_req_help_php', array('php_version' => PHP_VERSION));
+}
+else
+{
+$failed = true;
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_fail')) . "\n";
+}
+// Test: MySQL
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_mysql') . ': ';
+$req_mysql = function_exists('mysql_connect');
+if ( $req_mysql )
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_pass')) . "\n";
+$have_dbms = true;
+}
+else
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_fail')) . "\n";
+}
+// Test: PostgreSQL
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_postgresql') . ': ';
+$req_pgsql = function_exists('pg_connect');
+if ( $req_pgsql )
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_pass')) . "\n";
+$have_dbms = true;
+}
+else
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_fail')) . "\n";
+}
+if ( !$have_dbms )
+$failed = true;
+// Test: Safe Mode
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_safemode') . ': ';
+$req_safemode = !intval(@ini_get('safe_mode'));
+if ( !$req_safemode )
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_fail')) . "\n";
+$warnings[] = $lang->get('sysreqs_req_help_safemode');
+$failed = true;
+}
+else
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_pass')) . "\n";
+}
+// Test: File uploads
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_uploads') . ': ';
+$req_uploads = intval(@ini_get('file_uploads'));
+if ( $req_uploads )
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_pass')) . "\n";
+}
+else
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_warn')) . "\n";
+}
+// Test: ctype validation
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_ctype') . ': ';
+$req_ctype = function_exists('ctype_digit');
+if ( $req_ctype )
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_pass')) . "\n";
+}
+else
+{
+if ( !$silent ) echo parse_shellcolor_string($lang->get('cli_test_fail')) . "\n";
+$failed = true;
+}
+// Write tests
+$req_config_w = write_test('config.new.php');
+$req_htaccess_w = write_test('.htaccess.new');
+$req_files_w = write_test('files');
+$req_cache_w = write_test('cache');
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_config_writable') . ': ' . parse_shellcolor_string($lang->get($req_config_w ? 'cli_test_pass' : 'cli_test_fail')) . "\n";
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_htaccess_writable') . ': ' . parse_shellcolor_string($lang->get($req_htaccess_w ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_files_writable') . ': ' . parse_shellcolor_string($lang->get($req_files_w ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_cache_writable') . ': ' . parse_shellcolor_string($lang->get($req_cache_w ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+if ( !$req_config_w || !$req_htaccess_w || !$req_files_w || !$req_cache_w )
+$warnings[] = $lang->get('sysreqs_req_help_writable');
+if ( !$req_config_w )
+$failed = true;
+// Extension test: GD
+$req_gd = function_exists('imagecreatefrompng') && function_exists('getimagesize') && function_exists('imagecreatetruecolor') && function_exists('imagecopyresampled');
+if ( !$req_gd )
+$warnings[] = $lang->get('sysreqs_req_help_gd2');
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_gd2') . ': ' . parse_shellcolor_string($lang->get($req_gd ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+// FS test: ImageMagick
+$req_imagick = which('convert');
+if ( !$req_imagick )
+$warnings[] = $lang->get('sysreqs_req_help_imagemagick');
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_imagemagick') . ': ' . parse_shellcolor_string($lang->get($req_imagick ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+// Extension test: GMP
+$req_gmp = function_exists('gmp_init');
+if ( !$req_gmp )
+$warnings[] = $lang->get('sysreqs_req_help_gmp');
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_gmp') . ': ' . parse_shellcolor_string($lang->get($req_gmp ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+// Extension test: Big_Int
+$req_bigint = function_exists('bi_from_str');
+if ( !$req_bigint && !$req_gmp )
+$warnings[] = $lang->get('sysreqs_req_help_bigint');
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_bigint') . ': ' . parse_shellcolor_string($lang->get($req_bigint ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+// Extension test: BCMath
+$req_bcmath = function_exists('bcadd');
+if ( !$req_bcmath && !$req_bigint && !$req_gmp )
+$warnings[] = $lang->get('sysreqs_req_help_bcmath');
+if ( !$silent ) echo '  ' . $lang->get('sysreqs_req_bcmath') . ': ' . parse_shellcolor_string($lang->get($req_bcmath ? 'cli_test_pass' : 'cli_test_warn')) . "\n";
+if ( !empty($warnings) && !$silent )
+{
+echo parse_shellcolor_string($lang->get('cli_msg_test_warnings')) . "\n";
+echo "  " . implode("\n  ", $warnings) . "\n";
+}
 if ( !function_exists('mysql_connect') && !function_exists('pg_connect') )
 {
 installer_fail($lang->get('cli_err_no_drivers'));
 }
-if ( $test_failed )
+if ( $failed )
 {
 installer_fail($lang->get('cli_err_sysreqs_fail'));
 }
 ##

changeset 857	f3a5a276208c
parent 818	12346be3ec3d
child 924	142a29b583f9