@@ -24,98 +24,116 @@ rel="stylesheet" type="text/css" />
<div id="ushahidi_login_logo"><img src="../media/img/admin/logo_login.gif" width="400"
height="80" /></div>
<div id="ushahidi_login">
- <table width="100%" border="0" cellspacing="3" cellpadding="4"
- background="" id="ushahidi_loginbox">
- <form method="POST" name="frm_install" action="process.php"
- style="line-height: 100%; margin-top: 0; margin-bottom: 0">
- <?php
- if ($form->num_errors > 0 ) { ?>
- <tr>
- <td align="left" class="login_error">
- <?php
- print ( $form->error('username') =="") ?'':"• "
- . $form->error('username') . "<br />";
- print ( $form->error('host') =="") ?'':"• "
- .$form->error('host') . "<br />";
- print ( $form->error('db_name') =="") ?'':"• "
- .$form->error('db_name') . "<br />";
- print ( $form->error('permission') =="") ?'':"• "
- .$form->error('permission') . "<br />";
- print ( $form->error('load_db_tpl') =="") ?'':"• "
- .$form->error('load_db_tpl') . "<br />";
- print ( $form->error('connection') =="") ?'':"• "
- .$form->error('connection') . "<br />";
- ?>
- </td>
- </tr>
- <?php } ?>
- <tr>
- <td><strong>Base Path:</strong><br />
- <input type="text" name="base_path" class="login_text"
- value="<?php print $form->value('base_path'); ?>"/>
- <br />Just interested in the name of the sub folder.<br />
- If Ushahidi is in the root folder, leave this field empty. No slahes
- Eg. ushahidi
- </td>
- </tr>
- <tr>
- <td><strong>Username:</strong><br />
- <input type="text" name="username" class="login_text"
- value="<?php print $form->value('username'); ?>"/>
- <br />Your database username.
- </td>
- </tr>
- <tr>
- <td><strong>Password:</strong><br />
- <input type="password" name="password" class="login_text" />
- <br />Your database password.
- </td>
- </tr>
- <tr>
- <td>
- <strong>Database Host:</strong><br />
- <input type="text" name="host" class="login_text"
- value="<?php print $form->value('host') == '' ? 'localhost':$form->value('host'); ?>" />
- <br />Your database host. It could also be mysql.somedomain.com
- </td>
- </tr>
- <tr>
- <td>
- <strong>Database Name:</strong><br />
- <input type="text" name="db_name" class="login_text"
- value="<?php print $form->value('db_name'); ?>" />
- <br />The name of the database you want to run Ushahidi in.
- </td>
- </tr>
- <tr>
- <td>
- <strong>Database Type:</strong><br />
- <select name="select_db_type">
- <option value="mysql">mysql</option>
- <option value="postgresql">postgresql</option>
- </select>
- <br />Select the type of database you want to use.
- </td>
- </tr>
- <tr>
- <td>
- <strong>Table Prefix:</strong><br />
- <input type="text" name="table_prefix" class="login_text"
- value="<?php print $form->value('table_prefix'); ?>" />
- <br />The prefix to be used by the tables. Eg. ush_<br />
- Leave it blank for nothing.
- <input type="hidden" name="connection" />
- <input type="hidden" name="permission" />
- <input type="hidden" name="load_db_tpl" />
- </td>
- </tr>
-
- <tr>
- <td><input type="submit" id="install" name="install"
- value="Install" class="login_btn" /></td>
- </tr>
- </form>
- </table>
+
+ <?php
+ $ret = $install->_check_writable_dir();
+
+ if ($form->num_errors > 0 ) {
+ print ( $form->error('root_dir') =="") ?'':"• "
+ .$form->error('root_dir') . "<br /><br />";
+ print ( $form->error('config_dir') =="") ?'':"• "
+ .$form->error('config_dir') . "<br /><br />";
+ }?>
+
+ <p>
+ After fixing the above problem, click <a href="">here</a> to install ushahidi.
+ </p>
+
+ <?php
+ if($ret == 0 ){
+ if ($form->num_errors > 0 ) { ?>
+ <table width="100%" border="0" cellspacing="3" c<table width="100%" border="0" cellspacing="3" cellpadding="4"
+ background="" id="ushahidi_loginbox">ellpadding="4"
+ background="" id="ushahidi_loginbox">
+ <form method="POST" name="frm_install" action="process.php"
+ style="line-height: 100%; margin-top: 0; margin-bottom: 0">
+ <tr>
+ <td align="left" class="login_error">
+ <?php
+ print ( $form->error('username') =="") ?'':"• "
+ .$form->error('username') . "<br />";
+ print ( $form->error('host') =="") ?'':"• "
+ .$form->error('host') . "<br />";
+ print ( $form->error('db_name') =="") ?'':"• "
+ .$form->error('db_name') . "<br />";
+ print ( $form->error('permission') =="") ?'':"• "
+ .$form->error('permission') . "<br />";
+ print ( $form->error('load_db_tpl') =="") ?'':"• "
+ .$form->error('load_db_tpl') . "<br />";
+ print ( $form->error('connection') =="") ?'':"• "
+ .$form->error('connection') . "<br />";
+ ?>
+ </td>
+ </tr>
+ <?php } ?>
+ <tr>
+ <td><strong>Base Path:</strong><br />
+ <input type="text" name="base_path" class="login_text"
+ value="<?php print $form->value('base_path'); ?>"/>
+ <br />Just interested in the name of the sub folder.<br />
+ If Ushahidi is in the root folder, leave this field empty. No slahes
+ Eg. ushahidi
+ </td>
+ </tr>
+ <tr>
+ <td><strong>Username:</strong><br />
+ <input type="text" name="username" class="login_text"
+ value="<?php print $form->value('username'); ?>"/>
+ <br />Your database username.
+ </td>
+ </tr>
+ <tr>
+ <td><strong>Password:</strong><br />
+ <input type="password" name="password" class="login_text" />
+ <br />Your database password.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <strong>Database Host:</strong><br />
+ <input type="text" name="host" class="login_text"
+ value="<?php print $form->value('host') == '' ? 'localhost':$form->value('host'); ?>" />
+ <br />Your database host. It could also be mysql.somedomain.com
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <strong>Database Name:</strong><br />
+ <input type="text" name="db_name" class="login_text"
+ value="<?php print $form->value('db_name'); ?>" />
+ <br />The name of the database you want to run Ushahidi in.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <strong>Database Type:</strong><br />
+ <select name="select_db_type">
+ <option value="mysql">mysql</option>
+ <option value="postgresql">postgresql</option>
+ </select>
+ <br />Select the type of database you want to use.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <strong>Table Prefix:</strong><br />
+ <input type="text" name="table_prefix" class="login_text"
+ value="<?php print $form->value('table_prefix'); ?>" />
+ <br />The prefix to be used by the tables. Eg. ush_<br />
+ Leave it blank for nothing.
+ <input type="hidden" name="connection" />
+ <input type="hidden" name="permission" />
+ <input type="hidden" name="load_db_tpl" />
+ </td>
+ </tr>
+ <tr>
+ <td><input type="submit" id="install" name="install"
+ value="Install" class="login_btn" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <?php } ?>
</div>
</div>
</body>
installer/index.php
@@ -21,9 +21,13 @@ class Install
private $database_file;
-
+ private $install_directory;
public function __construct()
{
+ global $form;
+
+ $this->install_directory = dirname(dirname(__FILE__));
+
$this->index();
}
@@ -39,8 +43,6 @@ class Install
$db_name, $table_prefix, $base_path )
{
global $form;
- $install_directory = dirname(dirname(__FILE__));
-
//check for empty fields
if(!$username || strlen($username = trim($username)) == 0 ){
$form->set_error("username", "Please enter the username of the
@@ -60,14 +62,14 @@ class Install
// load database.template.php and work from it.
if(!file_exists('../application/config/database.template.php')){
$form->set_error("load_db_tpl","Sorry, I need a database.template.php file to work
- from. Please re-upload this file from your Ushahidi installation.");
+ from. Please re-upload this file from the Ushahidi files.");
}
if( !is_writable('../application/config')) {
$form->set_error('permission',"Sorry, can't write to the directory.
You'll have to either change the permissions on your Ushahidi
directory with this command <blockquote>chmod a+w
- $install_directory/application/config</blockquote> or
+ $this->install_directory/application/config</blockquote> or
create your database.php manually.");
}
@@ -347,6 +349,37 @@ class Install
return $buffer;
}
+
+ /**
+ * Check if relevant directories are writable.
+ */
+ public function _check_writable_dir() {
+ global $form;
+
+ if( !is_writable('../')) {
+ $form->set_error('root_dir',"Sorry, can't write to the directory. You'll have to " .
+ "change the permission on the directory <code>$this->install_directory/</code>. Make sure its writable by the webserver. <br />");
+ }
+
+ if( !is_writable('../application/config')) {
+ $form->set_error('config_dir',"Sorry, can't write to the directory.
+ You'll have to either change the permissions on your Ushahidi
+ directory with this command <code>chmod a+w
+ $this->install_directory/application/config</code> or
+ create your database.php manually.");
+ }
+
+ /**
+ * error exists, have user correct them.
+ */
+ if( $form->num_errors > 0 ) {
+ return 1;
+
+ } else {
+ return 0;
+ }
+
+ }
}
$install = new Install();
installer/install.php
369286263787b11fd28660a2c6ddd2d66eee6279
Henry Addo
eyedol@addhen.(none)
http://github.com/ushahidi/Ushahidi_Web/commit/4b1e2d70811d24c492c9ac6ac2b0ddc26950b119
4b1e2d70811d24c492c9ac6ac2b0ddc26950b119
2009-11-06T07:47:33-08:00
2009-11-06T07:47:33-08:00
Check for writable directories first before showing up the install form
a3e359d68a8b7f5beb99ccedcf1dc5474bfe0fba
Henry Addo
eyedol@addhen.(none)