Changeset 2566:9bf417837888 for admin/install

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

Location:

admin/install

Files:

• check.php (modified) (3 diffs)
• wizard.php (modified) (7 diffs)

admin/install/check.php

@@ -15 +15 @@
 {
      $err = array();
-     
+
      if (version_compare(phpversion(),'5.0','<')) {
           $err[] = sprintf(__('PHP version is %s (5.0 or earlier needed).'),phpversion());
      }
-     
+
      if (!function_exists('mb_detect_encoding')) {
           $err[] = __('Multibyte string module (mbstring) is not available.');
      }
-     
+
      if (!function_exists('iconv')) {
           $err[] = __('Iconv module is not available.');
      }
-     
+
      if (!function_exists('ob_start')) {
           $err[] = __('Output control functions are not available.');
      }
-     
+
      if (!function_exists('simplexml_load_string')) {
           $err[] = __('SimpleXML module is not available.');
      }
-     
+
      if (!function_exists('dom_import_simplexml')) {
           $err[] = __('DOM XML module is not available.');
      }
-     
+
      $pcre_str = base64_decode('w6nDqMOgw6o=');
      if (!@preg_match('/'.$pcre_str.'/u', $pcre_str)) {
           $err[] = __('PCRE engine does not support UTF-8 strings.');
      }
-     
+
      if (!function_exists("spl_classes")) {
           $err[] = __('SPL module is not available.');
      }
-     
+
      if ($con->driver() == 'mysql' || $con->driver() == 'mysqli')
      {
@@ -65 +65 @@
                     }
                }
-               
+
                if (!$innodb) {
                     $err[] = __('MySQL InnoDB engine is not available.');
@@ -78 +78 @@
           }
      }
-     
+
      return count($err) == 0;
 }
-?>

admin/install/wizard.php

@@ -72 +72 @@
                throw new Exception('<p>' . __($e->getMessage()) . '</p>');
           }
-          
+
           # Checks system capabilites
           require dirname(__FILE__).'/check.php';
@@ -79 +79 @@
                throw new Exception('<p>'.__('Dotclear cannot be installed.').'</p><ul><li>'.implode('</li><li>',$_e).'</li></ul>');
           }
-          
+
           # Check if dotclear is already installed
           $schema = dbSchema::init($con);
@@ -85 +85 @@
                throw new Exception(__('Dotclear is already installed.'));
           }
-          
+
           # Does config.php.in exist?
           $config_in = dirname(__FILE__).'/../../inc/config.php.in';
@@ -91 +91 @@
                throw new Exception(sprintf(__('File %s does not exist.'),$config_in));
           }
-          
+
           # Can we write config.php
           if (!is_writable(dirname(DC_RC_PATH))) {
                throw new Exception(sprintf(__('Cannot write %s file.'),DC_RC_PATH));
           }
-          
+
           # Creates config.php file
           $full_conf = file_get_contents($config_in);
-          
+
           writeConfigValue('DC_DBDRIVER',$DBDRIVER,$full_conf);
           writeConfigValue('DC_DBHOST',$DBHOST,$full_conf);
@@ -106 +106 @@
           writeConfigValue('DC_DBNAME',$DBNAME,$full_conf);
           writeConfigValue('DC_DBPREFIX',$DBPREFIX,$full_conf);
-          
+
           $admin_url = preg_replace('%install/wizard.php$%','',$_SERVER['REQUEST_URI']);
           writeConfigValue('DC_ADMIN_URL',http::getHost().$admin_url,$full_conf);
           writeConfigValue('DC_ADMIN_MAILFROM','dotclear@'.$_SERVER['HTTP_HOST'],$full_conf);
           writeConfigValue('DC_MASTER_KEY',md5(uniqid()),$full_conf);
-          
+
           $fp = @fopen(DC_RC_PATH,'wb');
           if ($fp === false) {
@@ -119 +119 @@
           fclose($fp);
           chmod(DC_RC_PATH, 0666);
-          
+
           $con->close();
           http::redirect('index.php?wiz=1');
@@ -148 +148 @@
   <meta name="GOOGLEBOT" content="NOSNIPPET" />
   <title><?php echo __('Dotclear installation wizard'); ?></title>
-     <link rel="stylesheet" href="../style/install.css" type="text/css" media="screen" /> 
+     <link rel="stylesheet" href="../style/install.css" type="text/css" media="screen" />
 </head>