Fix login, register, dashboard, + pengumuman

Tampilan login dan register diubah
Error include file diperbaiki
logout diperbaiki
penambahan pengumuman dan informasi saat registrasi
This commit is contained in:
Ibnu Maksum 2017-03-23 02:25:45 +07:00
parent 0f7268ba13
commit 24d7ef3f2d
15 changed files with 211 additions and 125 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
/system/config.php
.DS_Store
.vscode/
ui/compiled/*.tpl.php
ui/compiled/*.php

1
pages/Announcement.html Normal file
View File

@ -0,0 +1 @@
Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br>

View File

@ -1 +1 @@
Beli Voucher <b>bisa</b> </div> di sini
You can buy a voucher in my home<br><br><br>Dapatkan Voucher Internet di Warung terdekat

View File

@ -0,0 +1,2 @@
Before you registered, you must Buy Voucher first<br><br>
Sebelum mendaftar pastikan anda membeli voucher terlebih dahulu

View File

@ -111,12 +111,25 @@ if (isset($_SESSION['notify'])) {
unset($_SESSION['ntype']);
}
// on some server, it getting error because of slash is backwards
function _autoloader($class) {
if (strpos($class, '_') !== false) {
$class = str_replace('_','/',$class);
include 'autoload/' . $class . '.php';
if(file_exists('autoload/' . $class . '.php')){
include 'autoload/' . $class . '.php';
}else{
$class = str_replace("\\","/",$class);
if(file_exists(__DIR__.'/autoload/' . $class . '.php'))
include __DIR__.'/autoload/' . $class . '.php';
}
} else{
include 'autoload/' . $class . '.php';
if(file_exists('autoload/' . $class . '.php')){
include 'autoload/' . $class . '.php';
}else{
$class = str_replace("\\","/",$class);
if(file_exists(__DIR__.'/autoload/' . $class . '.php'))
include __DIR__.'/autoload/' . $class . '.php';
}
}
}

View File

@ -7,6 +7,6 @@
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @donate PayPal: iesien22@yahoo.com / Bank Mandiri: 130.00.1024957.4
**/
session_start();
if (session_status() == PHP_SESSION_NONE) session_start();
session_destroy();
header('location: index.php');

View File

@ -224,11 +224,11 @@ switch($do){
break;
case 'register-display':
$ui->display('register.tpl');
break;
default:
$ui->assign('username', "");
$ui->assign('fullname', "");
$ui->assign('address', "");
$ui->assign('phonenumber', "");
$ui->display('register.tpl');
break;
}

View File

@ -19,18 +19,18 @@ CREATE TABLE `tbl_appconfig` (
-- Dump Data for `tbl_appconfig`
--
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("1","CompanyName","PHPMixBill v5.0");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("1","CompanyName","PHPMixBill");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("2","theme","default");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("3","currency_code","Rp.");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("4","language","english");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("5","show-logo","1");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("6","nstyle","blue");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("7","timezone","Asia/Jakarta");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("8","dec_point",".");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("9","thousands_sep",",");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("8","dec_point",",");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("9","thousands_sep",".");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("10","rtl","0");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("11","address","Jl. Kubangsari VII No. 31 RT.03/RW.06 Bandung");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("12","phone","081322225141");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("11","address","");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("12","phone","");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("13","date_format","d M Y");
INSERT INTO tbl_appconfig (`id`,`setting`,`value`) VALUES ("14","note","Thank you...");
@ -221,7 +221,7 @@ CREATE TABLE `tbl_users` (
-- Dump Data for `tbl_users`
--
INSERT INTO tbl_users (`id`,`username`,`fullname`,`password`,`user_type`,`status`,`last_login`,`creationdate`) VALUES ("1","admin","Ismail Marzuqi","$1$W44.ns/.$MUnR0NeBH9xAcXm0Oku2h1","Admin","Active","2015-10-30 18:27:02","2014-06-23 01:43:07");
INSERT INTO tbl_users (`id`,`username`,`fullname`,`password`,`user_type`,`status`,`last_login`,`creationdate`) VALUES ("1","admin","Administrator","$1$W44.ns/.$MUnR0NeBH9xAcXm0Oku2h1","Admin","Active","2015-10-30 18:27:02","2014-06-23 01:43:07");
-- --------------------------------------------------------
-- Structure for 'tbl_voucher'

View File

@ -14,6 +14,8 @@ Contributor: Ibnu Maksum (@ibnux)
$_L['Login'] = 'Log-in';
$_L['Register'] = 'Register';
$_L['Announcement'] = 'Announcement';
$_L['Registration_Info'] = 'Registration Info';
$_L['Register_Voucher_Failed'] = 'Voucher not found, please buy voucher befor register';
$_L['Register_Success'] = 'Register Success! You can login now';
$_L['Sign_In_Member'] = 'Log in to Member Panel';
@ -217,7 +219,7 @@ $_L['Account_Information'] = 'Your Account Information';
$_L['Welcome_Text_User'] = 'Welcome to the Panel Members page, on this page you can:';
$_L['Welcome_Text_Admin'] = '<b>PHPMixBill</b> is a billing Hotspot and PPPOE for Mikrotik using PHP and Mikrotik API to comunicate with router. If you get more profit with this application, please donate us.<br>Watch project <a href="https://github.com/ibnux/phpmixbill" target="_blank">in here</a>';
//update
//update
$_L['Invalid_Username_or_Password'] = 'Invalid Username or Password';
$_L['Do_Not_Access'] = 'You do not have permission to access this page';
$_L['Incorrect_Current_Password'] = 'Incorrect Current Password';

View File

@ -12,8 +12,10 @@ Contributor: Ibnu Maksum (@ibnux)
------------------------------------
*/
$_L['Login'] = 'Masuk';
$_L['Login'] = 'Masuk';
$_L['Register'] = 'Daftar';
$_L['Announcement'] = 'Pengumuman';
$_L['Registration_Info'] = 'Info Pendaftaran';
$_L['Register_Voucher_Failed'] = 'Voucher tidak ditemukan, mohon beli dulu Voucher sebelum mendaftar';
$_L['Register_Success'] = 'Pendaftaran sukses!<br>silahkan masuk';
$_L['Sign_In_Member'] = 'Masuk ke Member Panel';

View File

@ -6,14 +6,6 @@
<title>{$_title} - {$_L['Login']}</title>
<link rel="shortcut icon" href="{$_theme}/images/logo.png" type="image/x-icon" />
<!-- Icons -->
<link rel="stylesheet" href="{$_theme}/fonts/ionicons/css/ionicons.min.css">
<link rel="stylesheet" href="{$_theme}/fonts/font-awesome/css/font-awesome.min.css">
<!-- Plugins -->
<link rel="stylesheet" href="{$_theme}/styles/plugins/waves.css">
<link rel="stylesheet" href="{$_theme}/styles/plugins/perfect-scrollbar.css">
<!-- Css/Less Stylesheets -->
<link rel="stylesheet" href="{$_theme}/styles/bootstrap.min.css">
<link rel="stylesheet" href="{$_theme}/styles/main.min.css">
@ -23,51 +15,67 @@
<!--[if IE 9]> <script src="{$_theme}/scripts/ie/matchMedia.js"></script> <![endif]-->
</head>
<body id="app" class="app off-canvas body-full">
<div class="main-container clearfix">
<div class="content-container" id="content">
<div class="page page-auth">
<div class="auth-container">
<div class="form-head mb20">
<h1 class="site-logo h2 mb5 mt5 text-center text-uppercase text-bold"><a href="./">{$_c['CompanyName']}</a></h1>
<h5 class="text-normal h5 text-center">{$_L['Sign_In_Member']}</h5>
</div>
{if isset($notify)}
<body>
<div class="container">
<div class="hidden-xs" style="height:150px"></div>
<div class="form-head mb20">
<h1 class="site-logo h2 mb5 mt5 text-center text-uppercase text-bold" style="text-shadow: 2px 2px 4px #757575;">{$_c['CompanyName']}</h1>
<hr>
</div>
{if isset($notify)}
<div class="row">
<div class="col-md-6 col-md-offset-3">
{$notify}
{/if}
<div class="form-container">
<form class="form-horizontal" action="{$_url}login/post" method="post">
<div class="md-input-container md-float-label">
<input type="text" name="username" placeholder="{$_L['Phone_Number']}" class="md-input">
<label>{$_L['Username']}</label>
</div>
</div>
</div>
{/if}
<div class="row">
<div class="col-md-4 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">{$_L['Announcement']}</div>
<div class="panel-body" style="height:296px;max-height:296px;overflow:scroll;">
{include file="$_path/../pages/Announcement.html"}
</div>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">{$_L['Sign_In_Member']}</div>
<div class="panel-body" style="height:296px;max-height:296px;">
<div class="form-container">
<form class="form-horizontal" action="{$_url}login/post" method="post">
<div class="md-input-container md-float-label">
<input type="text" name="username" placeholder="{$_L['Phone_Number']}" class="md-input">
<label>{$_L['Username']}</label>
</div>
<div class="md-input-container md-float-label">
<input type="password" name="password" class="md-input">
<label>{$_L['Password']}</label>
</div>
<div class="md-input-container md-float-label">
<input type="password" name="password" placeholder="{$_L['Password']}" class="md-input">
<label>{$_L['Password']}</label>
</div>
<div class="clearfix">
<div class="ui-checkbox ui-checkbox-primary right">
<label>
<input type="checkbox">
<span>Remember me</span>
</label>
<div class="clearfix hidden">
<div class="ui-checkbox ui-checkbox-primary right">
<label>
<input type="checkbox">
<span>Remember me</span>
</label>
</div>
</div>
</div>
<div class="btn-group btn-group-justified mb15">
<div class="btn-group">
<button type="submit" class="btn btn-primary">{$_L['Login']}</button>
</div>
<div class="btn-group">
<a href="{$_url}register" class="btn btn-success">{$_L['Register']}</a>
</div>
</div>
</form>
<div class="btn-group btn-group-justified mb15">
<div class="btn-group">
<button type="submit" class="btn btn-primary">{$_L['Login']}</button>
</div>
<div class="btn-group">
<a href="{$_url}register" class="btn btn-success">{$_L['Register']}</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script src="scripts/vendors.js"></script>
</body>

View File

@ -24,19 +24,35 @@
</head>
<body id="app" class="app off-canvas body-full">
<div class="main-container clearfix">
<div class="content-container" id="content">
<div class="page page-auth" style="margin-top:180px">
<div class="auth-container">
<div class="form-head mb20">
<h1 class="site-logo h2 mb5 mt5 text-center text-uppercase text-bold"><a href="./">{$_c['CompanyName']}</a></h1>
<h5 class="text-normal h5 text-center">{$_L['Register_Member']}</h5>
</div>
{if isset($notify)}
{$notify}
{/if}
<div class="form-container">
<form class="form-horizontal" action="{$_url}register/post" method="post">
<div class="container">
<div class="hidden-xs" style="height:150px"></div>
<div class="form-head mb20">
<h1 class="site-logo h2 mb5 mt5 text-center text-uppercase text-bold" style="text-shadow: 2px 2px 4px #757575;">{$_c['CompanyName']}</h1>
<hr>
</div>
{if isset($notify)}
<div class="row">
<div class="col-md-6 col-md-offset-3">
{$notify}
</div>
</div>
{/if}
<div class="row">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">{$_L['Registration_Info']}</div>
<div class="panel-body" style="height:375px;max-height:375px;overflow:scroll;">
{include file="$_path/../pages/Registration_Info.html"}
</div>
</div>
</div>
<form class="form-horizontal" action="{$_url}register/post" method="post">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">1. {$_L['Register_Member']}</div>
<div class="panel-body">
<div class="form-container">
<div class="md-input-container md-float-label">
<input type="text" required class="md-input" id="username" value="{$username}" placeholder="{$_L['Phone_Number']}" name="username">
<label>{$_L['Username']}</label>
@ -45,14 +61,6 @@
<input type="text" required class="md-input" id="fullname" value="{$fullname}" name="fullname">
<label>{$_L['Full_Name']}</label>
</div>
<div class="md-input-container md-float-label">
<input type="password" required class="md-input" id="password" name="password">
<label>{$_L['Password']}</label>
</div>
<div class="md-input-container md-float-label">
<input type="password" required class="md-input" id="cpassword" name="cpassword">
<label>{$_L['Confirm_Password']}</label>
</div>
<div class="md-input-container md-float-label">
<input type="text" name="address" id="address" value="{$address}" class="md-input">
<label>{$_L['Address']}</label>
@ -61,6 +69,24 @@
<input type="text" required class="md-input" value="{$phonenumber}" id="phonenumber" name="phonenumber">
<label>{$_L['Phone_Number']}</label>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">2. {$_L['Register_Member']}</div>
<div class="panel-body">
<div class="form-container">
<div class="md-input-container md-float-label">
<input type="password" required class="md-input" id="password" name="password">
<label>{$_L['Password']}</label>
</div>
<div class="md-input-container md-float-label">
<input type="password" required class="md-input" id="cpassword" name="cpassword">
<label>{$_L['Confirm_Password']}</label>
</div>
<hr>
<div class="md-input-container md-float-label">
<input type="text" required class="md-input" id="kodevoucher" name="kodevoucher">
<label>{$_L['Code_Voucher']}</label>
@ -73,12 +99,12 @@
<a href="{$_url}login" class="btn btn-success">{$_L['Cancel']}</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<script src="scripts/vendors.js"></script>
</body>

View File

@ -235,6 +235,19 @@
<li {if $_system_menu eq 'network'}class="active"{/if}><a href="{$_url}pool/list">{$_L['Pool']}</a></li>
</ul>
</li>
<li {if $_system_menu eq 'pages'}class="open"{/if}>
<a href="#" onClick="toggleDropdownMobile(this)">
<i class="ion ion-document"></i>
<span class="text">{$_L['Static_Pages']}</span>
<i class="arrow ion-chevron-left"></i>
</a>
<ul class="inner-drop list-unstyled">
<li {if $_system_menu eq 'pages'}class="active"{/if}><a href="{$_url}pages/Order_Voucher">{$_L['Order_Voucher']}</a></li>
<li {if $_system_menu eq 'pages'}class="active"{/if}><a href="{$_url}pages/Voucher">{$_L['Voucher']} Template</a></li>
<li {if $_system_menu eq 'pages'}class="active"{/if}><a href="{$_url}pages/Announcement">{$_L['Announcement']} Editor</a></li>
<li {if $_system_menu eq 'pages'}class="active"{/if}><a href="{$_url}pages/Registration_Info">{$_L['Registration_Info']} Editor</a></li>
</ul>
</li>
<li {if $_system_menu eq 'settings'}class="open"{/if}>
<a href="#" onClick="toggleDropdownMobile(this)">
<i class="ion ion-gear-a"></i>
@ -249,17 +262,6 @@
<li>&nbsp;</li>
</ul>
</li>
<li {if $_system_menu eq 'pages'}class="open"{/if}>
<a href="#" onClick="toggleDropdownMobile(this)">
<i class="ion ion-document"></i>
<span class="text">{$_L['Static_Pages']}</span>
<i class="arrow ion-chevron-left"></i>
</a>
<ul class="inner-drop list-unstyled">
<li {if $_system_menu eq 'pages'}class="active"{/if}><a href="{$_url}pages/Order_Voucher">{$_L['Order_Voucher']}</a></li>
<li {if $_system_menu eq 'pages'}class="active"{/if}><a href="{$_url}pages/Voucher">{$_L['Voucher']} Template</a></li>
</ul>
</li>
<li {if $_system_menu eq 'disquss'}class="active"{/if}>
<a href="{$_url}disquss">
<i class="ion ion-chatbubbles"></i>

View File

@ -86,7 +86,7 @@
<nav class="site-nav clearfix" role="navigation">
<div class="profile clearfix mb15">
<img src="system/uploads/user.jpg" alt="admin">
<img src="https://robohash.org/{$_user['id']}?set=set3&size=100x100&bgset=bg1" alt="admin">
<div class="group">
<div class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{$_user['fullname']}<span class="caret"></span></a>
<ul class="dropdown-menu">

View File

@ -1,11 +1,11 @@
{include file="sections/user-header.tpl"}
<div class="row">
<div class="col-md-12">
<div class="dash-head clearfix mt15 mb20">
<div class="left">
<h4 class="mb5 text-light">{$_L['Welcome']}, {$_user['fullname']}</h4>
<p>{$_L['Welcome_Text_User']}</p>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">{$_L['Welcome']}, {$_user['fullname']}</div>
<div class="panel-body" style="height:296px;max-height:296px;overflow:scroll;">
<p>{$_L['Welcome_Text_User']}</p>
<ul>
<li> {$_L['Account_Information']}</li>
<li> <a href="{$_url}voucher/activation">{$_L['Voucher_Activation']}</a></li>
@ -14,33 +14,63 @@
<li> {$_L['Order_Voucher']}</li>
<li> {$_L['Private_Message']}</li>
</ul>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<br class="visible-xs-inline visible-sm-inline">
<div class="panel panel-default">
<div class="panel-heading">{$_L['Announcement']}</div>
<div class="panel-body" style="height:296px;max-height:296px;overflow:scroll;">
{include file="$_path/../pages/Announcement.html"}
</div>
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-sm-12">
<div class="panel mb20 panel-primary panel-hovered">
<div class="col-sm-6">
<div class="panel panel-default table-condensed">
<div class="panel-heading">{$_L['Account_Information']}</div>
<table class="table table-striped table-bordered">
<tr>
<td class="small text-success text-uppercase text-normal">{$_L['Username']}</td>
<td class="small mb15">{$_bill['username']}</td>
</tr>
<tr>
<td class="small text-primary text-uppercase text-normal">{$_L['Plan_Name']}</td>
<td class="small mb15">{$_bill['namebp']}</td>
</tr>
<tr>
<td class="small text-info text-uppercase text-normal">{$_L['Created_On']}</td>
<td class="small mb15">{if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['recharged_on']))} {$_bill['time']}{/if}&nbsp;</td>
</tr>
<tr>
<td class="small text-danger text-uppercase text-normal">{$_L['Expires_On']}</td>
<td class="small mb15">{if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['expiration']))} {$_bill['time']}{/if}&nbsp;</td>
</tr>
</table>
</div>
</div>
<div class="col-sm-6">
<br class="visible-xs-inline visible-sm-inline">
<div class="panel panel-primary panel-hovered panel-stacked mb30">
<div class="panel-heading">{$_L['Voucher_Activation']}</div>
<div class="panel-body">
<div class="row">
<div class="col-sm-3">
<p class="small text-success text-uppercase text-normal">{$_L['Username']}</p>
<p class="small mb15">{$_bill['username']}</p>
</div>
<div class="col-sm-3">
<p class="small text-primary text-uppercase text-normal">{$_L['Plan_Name']}</p>
<p class="small mb15">{$_bill['namebp']}</p>
</div>
<div class="col-sm-3">
<p class="small text-info text-uppercase text-normal">{$_L['Created_On']}</p>
<p class="small mb15">{date($_c['date_format'], strtotime($_bill['recharged_on']))} {$_bill['time']}</p>
</div>
<div class="col-sm-3">
<p class="small text-danger text-uppercase text-normal">{$_L['Expires_On']}</p>
<p class="small mb15">{date($_c['date_format'], strtotime($_bill['expiration']))} {$_bill['time']}</p>
</div>
</div>
<form class="form-horizontal" method="post" role="form" action="{$_url}voucher/activation-post" >
<div class="form-group">
<label class="col-md-4 control-label">{$_L['Code_Voucher']}</label>
<div class="col-md-6">
<input type="text" class="form-control" id="code" name="code" placeholder="{$_L['Enter_Voucher_Code']}">
</div>
</div>
<div class="form-group">
<div align="center">
<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Recharge']}</button>
</div>
</div>
</form>
</div>
</div>
</div>