github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

changing uptime table to servers_uptime, adding primary key and fixing 

install sql for it
pull/26/head
Pepijn Over 2014-03-14 19:26:25 +01:00
parent 26f8fedffe
commit d32eafe9ec
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/includes/functions.inc.php
View File

@ -179,7 +179,7 @@ function psm_log_uptime($server_id, $status, $latency) {
global $db; global $db;
$db->save( $db->save(
PSM_DB_PREFIX.'uptime', PSM_DB_PREFIX.'servers_uptime',
array( array(
'server_id' => $server_id, 'server_id' => $server_id,
'date' => date('Y-m-d H:i:s'), 'date' => date('Y-m-d H:i:s'),

5
src/psm/Module/Install.class.php
View File

@ -263,9 +263,10 @@ class Install extends AbstractModule {
unset($new_user['password_repeat']); unset($new_user['password_repeat']);
$user_id = $this->db->save(PSM_DB_PREFIX.'users', $new_user); $user_id = $this->db->save(PSM_DB_PREFIX.'users', $new_user);
if(intval($user_id) > 0) { 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 { } else {
$this->addMessage('There was an error adding your user account.'); $this->addMessage('There was an error adding your user account.', 'error');
} }
} }

38
src/psm/Util/Install/Installer.class.php
View File

@ -131,7 +131,12 @@ class Installer {
*/ */
protected function installTables() { protected function installTables() {
$tables = array( $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_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`user_name` varchar(64) NOT NULL COMMENT 'user''s name, unique', `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', `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', `sms` enum('yes','no') NOT NULL default 'no',
PRIMARY KEY (`server_id`) PRIMARY KEY (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX . 'config' => "CREATE TABLE `" . PSM_DB_PREFIX . "config` ( PSM_DB_PREFIX . 'servers_uptime' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` (
`key` varchar(255) NOT NULL, `servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`value` varchar(255) NOT NULL, `server_id` int(11) unsigned NOT NULL,
PRIMARY KEY (`key`) `date` datetime NOT NULL,
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", `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) { foreach($tables as $name => $sql) {
@ -205,7 +214,7 @@ class Installer {
// upgrade to 2.2.0 // upgrade to 2.2.0
$this->upgrade220(); $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[] = "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[] = "ALTER TABLE `" . PSM_DB_PREFIX . "users` ADD UNIQUE `unique_username` ( `user_name` );";
$queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "uptime` ( $queries[] = "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` (
`server_id` INT( 11 ) NOT NULL, `servers_uptime_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`date` DATETIME NOT NULL , `server_id` int(11) unsigned NOT NULL,
`status` INT( 1 ) NOT NULL , `date` datetime NOT NULL,
`latency` FLOAT( 9, 7 ) NULL `status` tinyint(1) unsigned NOT NULL,
) ENGINE = MYISAM ;"; `latency` float(9,7) DEFAULT NULL,
PRIMARY KEY (`servers_uptime_id`),
KEY `server_id` (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
$this->execSQL($queries); $this->execSQL($queries);
} }

2
src/templates/install.tpl.html
View File

@ -77,7 +77,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<form id="psm_config" class="form-horizontal" action="install.php?action=config" method="post"> <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"> <div class="control-group">
<label class="control-label" for="host">Database host</label> <label class="control-label" for="host">Database host</label>
<div class="controls"> <div class="controls">