Changeset 5384 for trunk/install.php


Ignore:
Timestamp:
03/26/10 16:44:48 (10 years ago)
Author:
patdenice
Message:

Fix php5 apache configuration with install.
Fix php5 apache configuration display.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/install.php

    r5357 r5384  
    2525define('PHPWG_ROOT_PATH','./'); 
    2626 
    27 include(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php'); 
    28  
    2927@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime 
    3028// 
     
    183181} 
    184182 
    185 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php'); 
    186183include(PHPWG_ROOT_PATH . 'include/constants.php'); 
    187184include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); 
     
    261258} 
    262259//---------------------------------------------------------------- form analyze 
     260include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php'); 
     261include(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php'); 
     262 
    263263if ( isset( $_POST['install'] )) 
    264264{ 
    265   try 
    266   { 
    267     $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'],  
    268                                   $_POST['dbpasswd'], $_POST['dbname']); 
    269   
    270     array_push( $infos, l10n('Parameters are correct') ); 
    271      
     265  if (try_db_connection($infos, $errors)) 
     266  { 
    272267    $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION'); 
    273268    if ( version_compare(pwg_get_db_version(), $required_version, '>=') ) 
     
    296291    } 
    297292  } 
    298   catch (Exception $e) 
    299   { 
    300     array_push( $errors, l10n($e->getMessage())); 
    301   } 
     293 
    302294  $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name )); 
    303295  if ( empty($webmaster)) 
Note: See TracChangeset for help on using the changeset viewer.