Changeset 5384

Timestamp:

Mar 26, 2010, 4:44:48 PM (14 years ago)

Author:

patdenice

Message:

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

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (1 diff)
• install.php (modified) (4 diffs)
• install/php5_apache_configuration.php (modified) (2 diffs)

trunk/admin/include/functions_install.inc.php

@@ -139 +139 @@
   }
 }
+
+function try_db_connection(&$infos, &$errors)
+{
+  try
+  {
+    $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], 
+                                  $_POST['dbpasswd'], $_POST['dbname']);
+ 
+    array_push( $infos, l10n('Parameters are correct') );
+    return true;
+  }
+  catch (Exception $e)
+  {
+    array_push( $errors, l10n($e->getMessage()));
+  }
+  return false;
+}
 ?>

trunk/install.php

@@ -25 +25 @@
 define('PHPWG_ROOT_PATH','./');
 
-include(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php');
-
 @set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 //
@@ -183 +181 @@
 }
 
-include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php');
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
@@ -261 +258 @@
 }
 //---------------------------------------------------------------- form analyze
+include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php');
+include(PHPWG_ROOT_PATH . 'admin/include/functions_install.inc.php');
+
 if ( isset( $_POST['install'] ))
 {
-  try
-  {
-    $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], 
-                                  $_POST['dbpasswd'], $_POST['dbname']);
- 
-    array_push( $infos, l10n('Parameters are correct') );
-    
+  if (try_db_connection($infos, $errors))
+  {
     $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
     if ( version_compare(pwg_get_db_version(), $required_version, '>=') )
@@ -296 +291 @@
     }
   }
-  catch (Exception $e)
-  {
-    array_push( $errors, l10n($e->getMessage()));
-  }
+
   $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
   if ( empty($webmaster))

trunk/install/php5_apache_configuration.php

@@ -80 +80 @@
 <link rel="stylesheet" type="text/css" href="admin/themes/roma/theme.css">
 <style type="text/css">
+body {
+  background:url("admin/themes/roma/images/bottom-left-bg.jpg") no-repeat fixed left bottom #111111;
+}
+
 .content {
-  width: 800px;
-  min-height: 0px !important;
-  margin: auto;
-  padding: 25px;
-  text-align: left;
+ background:url("admin/themes/roma/images/fillet.png") repeat-x scroll left top #222222;
+ width: 800px;
+ min-height: 0px !important;
+ margin: auto;
+ text-align: left;
+ padding: 25px;
+}
+
+#headbranch  {
+  background:url("admin/themes/roma/images/top-left-bg.jpg") no-repeat scroll left top transparent;
+}
+
+#theHeader {
+  display: block;
+  background:url("admin/themes/roma/images/piwigo_logo_sombre_214x100.png") no-repeat scroll 245px top transparent;
+}
+
+.content h2 {
+  display:block;
+  font-size:28px;
+  height:104px;
+  width:54%;
+  color:#666666;
+  letter-spacing:-1px;
+  margin:0 30px 3px 20px;
+  overflow:hidden;
+  position:absolute;
+  right:0;
+  text-align:right;
+  top:0;
+  width:770px;
+  text-align:right;
+  text-transform:none; 
 }
 
@@ -143 +175 @@
     <td>
       <select name="language" onchange="document.location = \''.$script.'.php?language=\'+this.options[this.selectedIndex].value;">';
-  foreach (get_languages('utf-8') as $code => $name)
+  foreach ($languages->fs_languages as $code => $name)
   {
     echo '