Skip to content

Commit

Permalink
Update installer for 8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@idoalit
idoalit committed Jun 22, 2016
1 parent 9c3b19f commit b902c31
Show file tree
Hide file tree
Showing 9 changed files with 131 additions and 122 deletions.
39 changes: 7 additions & 32 deletions install/check_system.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
<link rel="stylesheet" type="text/css" href="fonts/font-awesome/css/font-awesome.css">
</head>
<body>
<div class="wrapper">
<div class="title">
<h2>Step 1 - Environment Checking</h2>
</div>
<p class="message">Check the minimum system environment for installing SLiMS</p>
<div class="wrapper" id="welcome-wrap">
<div class="content hastable">
<div class="title">
<h2>Step 1 - Environment Checking</h2>
</div>
<p class="message">Check the minimum system environment for installing SLiMS</p>
<div class="items">
<div class="key">
PHP version
Expand Down Expand Up @@ -132,11 +132,11 @@
<?php echo ($yaz_pass) ? '' : '&nbsp; <em>optional</em>'; ?>
</div>
</div>

<hr>
<div class="toright">
<?php
if ($pass == $pass_max) { ?>
<input type="button" id="upgrade-btn" class="button upgrade" name="btn_cancel" value="Upgrade" title="Click to start upgrade">
<input type="button" id="upgrade-btn" class="button upgrade" name="btn_cancel" value="Upgrade" title="Click to start upgrade" onclick="document.location.href='upgrade.php'">
<input type="button" class="button" value="New Install" name="submit" title="Click to start installation" onclick="document.location.href='install.php'">
<?php } else { ?>
<input type="button" class="button disabled" name="btn_cancel" value="Upgrade" title="Click to start upgrade">
Expand All @@ -146,30 +146,5 @@
</div>
<?php include_once("footer.php"); ?>
</div>

<div class="upgrade-warning">
<div class="panel">
<div class="panel-header"><h4>PERHATIAN!</h4></div>
<div class="panel-body">
<p>Sistem keamanan baru pada akasia akan mengakibatkan kata kunci masuk pustakawan (password user) dan area anggota (password member) akan direset menjadi kata kunci standar (default) yaitu "akasia" (tanpa tanda petik).</p>
<p>Apakah anda tetap ingin melanjutkan upgrade ?</p>
</div>
<div class="panel-footer">
<a href="#" class="button" id="close-btn">Tidak</a>
<input type="button" class="button upgrade" name="btn_cancel" value="Ya" title="Click to start upgrade" onclick="document.location.href='upgrade.php'">
</div>
</div>
</div>
<script type="text/javascript" src="./../js/jquery.js"></script>
<script type="text/javascript">
$(document).ready(function () {
$('#upgrade-btn').click(function () {
$('.upgrade-warning').addClass('active');
});
$('#close-btn').click(function () {
$('.upgrade-warning').removeClass('active');
});
});
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion install/footer.php
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="footer">
Slims Installer Powered By <a href='http://www.apphp.com/php-easyinstaller/index.php' style="color: #bb5500" target="_blank">PHP Easy Installer</a> | <a href="license/GNULicense.html" target="_blank">Lisence</a>
SLiMS 8.3 Installer Powered By <a href='http://www.apphp.com/php-easyinstaller/index.php' style="color: #bb5500" target="_blank">PHP Easy Installer</a> | <a href="license/GNULicense.html" target="_blank">Lisence</a>
</div>
5 changes: 2 additions & 3 deletions install/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<div class="content-body">
<div id="welcome-title">
<div id="logo"><img src="img/logo.png"></div>
<h2>Welcome to SLiMS 8 Akasia</h2>
<h2>Welcome to SLiMS 8 Akasia <small>update 3</small></h2>
</div>
<div class="content-footer">
<div class="toright">
Expand All @@ -69,8 +69,7 @@

<?php include_once("footer.php"); ?>

</div>

</div>
</body>
</html>

66 changes: 33 additions & 33 deletions install/install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
</head>
<body>
<div class="wrapper">
<div class="title">
<h2>Step 2 - Generate the database </h2>
</div>
<p class="message">Please complete following form with your database connection information</p>
<div class="content hastable">
<div class="title">
<h2>Step 2 - Generate the database </h2>
</div>
<p class="message">Please complete following form with your database connection information</p>
<form method="post" action="install2.php">
<input type="hidden" name="submit" value="step2" />
<table class=text width="100%" border="0" cellspacing="0" cellpadding="2" class="main_text">
Expand Down Expand Up @@ -72,37 +72,37 @@
</td>
</tr>
</table>
<p class="message">Please complete following form with user login and password (Optional)</p>
<div class="hastable">
<table class=text width="100%" border="0" cellspacing="0" cellpadding="2" class="main_text">
<tr>
<td>&nbsp;Username</td>
<td>
<input type="text" class="form_text" name="username" size="30" value="admin">&nbsp; <em>default : admin</em>
</td>
</tr>
<tr>
<td>Password</td>
<td>
<input type="password" class="form_text" name="password" size="30" value="">&nbsp; <em>default : admin</em>
</td>
</tr>
<tr>
<td>Retype Password</td>
<td>
<input type="password" class="form_text" name="retype_password" size="30" value="">
</td>
</tr>
</table>
<hr/>
<div class="toright">
<input type="button" class="button" name="btn_cancel" value="Back" onclick="document.location.href='check_system.php'">
<input type="submit" class="button" name="btn_submit" value="Next">
</div>
</div>
</div>
<p class="message">Please complete following form with user login and password (Optional)</p>
<div class="content hastable">
<table class=text width="100%" border="0" cellspacing="0" cellpadding="2" class="main_text">
<tr>
<td>&nbsp;Username</td>
<td>
<input type="text" class="form_text" name="username" size="30" value="admin">&nbsp; <em>default : admin</em>
</td>
</tr>
<tr>
<td>Password</td>
<td>
<input type="password" class="form_text" name="password" size="30" value="">&nbsp; <em>default : admin</em>
</td>
</tr>
<tr>
<td>Retype Password</td>
<td>
<input type="password" class="form_text" name="retype_password" size="30" value="">
</td>
</tr>
</table>
<br/>
<div class="toright">
<input type="button" class="button" name="btn_cancel" value="Back" onclick="document.location.href='check_system.php'">
<input type="submit" class="button" name="btn_submit" value="Next">
</div>
</form>
</div>
<?php include_once("footer.php"); ?>
<?php include_once("footer.php"); ?>
</div>
</body>
</html>
18 changes: 9 additions & 9 deletions install/install2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

$completed = false;
$error_mg = array();
$indexdbupgrade_max = 15;
$indexdbupgrade_max = 17;

function apphp_db_install_core($database, $sql_file)
{
Expand Down Expand Up @@ -366,39 +366,39 @@ function apphp_db_install($database, $sql_file)
<body>
<div class="wrapper">
<?php if(!$completed) { ?>
<div class="content">
<div class="title">
<h2>Step 3 - Installation Not Completed</h2>
</div>
<p class="error">Please correct your information according to this message</p>
<div class="content">
<h2>Step 3 - Installation Not Completed</h2>
</div>
<p class="error">Please correct your information according to this message</p>
<?php
foreach($error_mg as $msg){
echo "<ul class=\"list\">".$msg."</ul>";
}
?>
<hr>
<div class="toright">
<input type="button" class="button" value="Back" name="submit" onclick="javascript: history.go(-1);">
<input type="button" class="button" value="Retry" name="submit" onclick="javascript: location.reload();">
</div>
<br/>
</div>
<?php } else { ?>
<div class="content">
<div class="title">
<h2>Step 3 - Installation Completed</h2>
</div>
<p class="success">Hooray, the installation was successful</p>
<div class="content">
<p>The <?php echo $config_file_name;?> file was sucessfully created.</p>
<p>For security reasons, please remove <code style="font-weight: bold;">install/</code> folder from your server.</p>
<br/>
<hr>
<div class="toright">
<?php if($application_start_file != ""){ ?><a href="<?php echo $application_start_file;?>" class="button">OK, start the SLiMS</a><?php } ?>
</div>
<br/>
<?php } ?>
<?php include_once("footer.php"); ?>
</div>

<?php include_once("footer.php"); ?>
</div>

</body>
Expand Down
4 changes: 3 additions & 1 deletion install/settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@
'13' => 'upgrade_stable15.sql',
'14' => 'upgrade_slims5_meranti.sql',
'15' => 'upgrade_slims7_cendana.sql',
'16' => 'upgrade_slims8_akasia.sql'
'16' => 'upgrade_slims8_akasia.sql',
'17' => 'upgrade_slims8.2_akasia.sql',
'18' => 'upgrade_slims8.3_akasia.sql'
);
4 changes: 2 additions & 2 deletions install/sql_php_upgrade/upgrade_slims8.2_akasia.sql.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
--
*/
$sql['insert'][] = "INSERT IGNORE INTO `setting` (`setting_name`, `setting_value`) VALUES
('enable_visitor_limitation', 's:1:"0";'),
('time_visitor_limitation', 's:2:"60";');";
('enable_visitor_limitation', 's:1:\"0\";'),
('time_visitor_limitation', 's:2:\"60\";');";

/*
--
Expand Down
Loading

0 comments on commit b902c31

Please sign in to comment.