From d32eafe9ecdeaaf64a3df34d6f3a2cac0fc929c0 Mon Sep 17 00:00:00 2001
From: Pepijn Over <pep@neanderthal-technology.com>
Date: Fri, 14 Mar 2014 19:26:25 +0100
Subject: [PATCH] changing uptime table to servers_uptime, adding primary key
 and fixing install sql for it

---
 src/includes/functions.inc.php           |  2 +-
 src/psm/Module/Install.class.php         |  5 ++--
 src/psm/Util/Install/Installer.class.php | 38 ++++++++++++++++--------
 src/templates/install.tpl.html           |  2 +-
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php
index e39e4f88..2fb42aa4 100755
--- a/src/includes/functions.inc.php
+++ b/src/includes/functions.inc.php
@@ -179,7 +179,7 @@ function psm_log_uptime($server_id, $status, $latency) {
     global $db;
 
     $db->save(
-        PSM_DB_PREFIX.'uptime',
+        PSM_DB_PREFIX.'servers_uptime',
         array(
             'server_id' => $server_id,
             'date' => date('Y-m-d H:i:s'),
diff --git a/src/psm/Module/Install.class.php b/src/psm/Module/Install.class.php
index 6ab9cfc8..36d9a223 100755
--- a/src/psm/Module/Install.class.php
+++ b/src/psm/Module/Install.class.php
@@ -263,9 +263,10 @@ class Install extends AbstractModule {
 			unset($new_user['password_repeat']);
 			$user_id = $this->db->save(PSM_DB_PREFIX.'users', $new_user);
 			if(intval($user_id) > 0) {
-				$this->addMessage('User account has been created successfully.');
+				$this->user->changePassword($user_id, $new_user['password']);
+				$this->addMessage('User account has been created successfully.', 'success');
 			} else {
-				$this->addMessage('There was an error adding your user account.');
+				$this->addMessage('There was an error adding your user account.', 'error');
 			}
 		}
 
diff --git a/src/psm/Util/Install/Installer.class.php b/src/psm/Util/Install/Installer.class.php
index ac8f1da3..dafcd4ae 100755
--- a/src/psm/Util/Install/Installer.class.php
+++ b/src/psm/Util/Install/Installer.class.php
@@ -131,7 +131,12 @@ class Installer {
 	 */
 	protected function installTables() {
 		$tables = array(
-			PSM_DB_PREFIX . 'users' => "CREATE TABLE IF NOT EXISTS `monitor_users` (
+			PSM_DB_PREFIX . 'config' => "CREATE TABLE `" . PSM_DB_PREFIX . "config` (
+							`key` varchar(255) NOT NULL,
+							`value` varchar(255) NOT NULL,
+							PRIMARY KEY (`key`)
+						) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+			PSM_DB_PREFIX . 'users' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users` (
 							`user_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
 							`user_name` varchar(64) NOT NULL COMMENT 'user''s name, unique',
 							`password` varchar(255) NOT NULL COMMENT 'user''s password in salted and hashed format',
@@ -172,11 +177,15 @@ class Installer {
 						  `sms` enum('yes','no') NOT NULL default 'no',
 						  PRIMARY KEY  (`server_id`)
 						) ENGINE=MyISAM  DEFAULT CHARSET=utf8;",
-			PSM_DB_PREFIX . 'config' => "CREATE TABLE `" . PSM_DB_PREFIX . "config` (
-							`key` varchar(255) NOT NULL,
-							`value` varchar(255) NOT NULL,
-							PRIMARY KEY (`key`)
-						) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
+			PSM_DB_PREFIX . 'servers_uptime' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` (
+						`servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+						`server_id` int(11) unsigned NOT NULL,
+						`date` datetime NOT NULL,
+						`status` tinyint(1) unsigned NOT NULL,
+						`latency` float(9,7) DEFAULT NULL,
+						PRIMARY KEY (`servers_uptime_id`),
+						KEY `server_id` (`server_id`)
+					  ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;",
 		);
 
 		foreach($tables as $name => $sql) {
@@ -205,7 +214,7 @@ class Installer {
 			// upgrade to 2.2.0
 			$this->upgrade220();
 		}
-		$this->db->save(PSM_DB_PREFIX . 'config', array('value' => $version_from), array('key' => 'version'));
+		$this->db->save(PSM_DB_PREFIX . 'config', array('value' => $version_to), array('key' => 'version'));
 	}
 
 	/**
@@ -248,12 +257,15 @@ class Installer {
 		$queries[] = "UPDATE `" . PSM_DB_PREFIX . "users` SET `user_name`=`email`, `level`=10;";
 		$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD UNIQUE `unique_username` ( `user_name` );";
 
-		$queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "uptime` (
-				`server_id` INT( 11 ) NOT NULL,
-				`date` DATETIME NOT NULL ,
-				`status` INT( 1 ) NOT NULL ,
-				`latency`  FLOAT( 9, 7 ) NULL
-			   ) ENGINE = MYISAM ;";
+		$queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` (
+						`servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+						`server_id` int(11) unsigned NOT NULL,
+						`date` datetime NOT NULL,
+						`status` tinyint(1) unsigned NOT NULL,
+						`latency` float(9,7) DEFAULT NULL,
+						PRIMARY KEY (`servers_uptime_id`),
+						KEY `server_id` (`server_id`)
+					  ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;";
 
 		$this->execSQL($queries);
 	}
diff --git a/src/templates/install.tpl.html b/src/templates/install.tpl.html
index 5a927e65..019119f5 100755
--- a/src/templates/install.tpl.html
+++ b/src/templates/install.tpl.html
@@ -77,7 +77,7 @@
 <div class="row-fluid">
    <div class="span6">
 	<form id="psm_config" class="form-horizontal" action="install.php?action=config" method="post">
-	  <h3>Please enter your database info:</h3>
+	  <p>Please enter your database info:</p>
 	  <div class="control-group">
 		<label class="control-label" for="host">Database host</label>
 		<div class="controls">