Skip to content

Commit

Permalink
kleeja 3.1
Browse files Browse the repository at this point in the history
3.1.0
  • Loading branch information
MitanOmar authored Jun 2, 2019
2 parents 91517fa + 6716695 commit b3204ee
Show file tree
Hide file tree
Showing 134 changed files with 7,769 additions and 8,480 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ uploads/thumbs/*
!uploads/thumbs/index.html
!uploads/thumbs/php.ini
!uploads/thumbs/.htaccess
styles/*
!styles/bootstrap/*
!styles/default/*
!styles/index.html
.DS_Store
*/.DS_Store
*/*/.DS_Store
Expand Down
27 changes: 25 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## 3.1.0
- add the ability to auto-update kleeja from admin panel with one click!
- add plugins/styles store (one click download, install and update or even delete)
- a plugins/styles catalog (any developer can add his/her plugins/styles now)
- fix `fields doesn't have a default value` error #104
- fix e modifier is deprecated #103
- fix update check redirect error #97
- improve ban control page #94
- add the ability to ban by username
- add support of mkv files #83
- add support of most known-to-humans timezones #78
- fix download counter to skip unwanted visits.
- fix pagination error in user files page
- fix some issues with some plugins (kj_ftp, for example.)
- replace Kleeja team page with current github contributors 😇
- add ability to hide/show widgets in home page of admin panel.
- fix issues with downloaded persian/arabic filesnames #53
- fix `remember me` issue on login page.
- add solution for hosts running under suexec (by adding `define('HAS_SUEXEC', true);` to config.php)
- fix issue with auto-deleting old files feature.
- removed feature : Uploading from URLs (leech).


## 3.0.2
- new styles, drag and drop and progressbar and bootstrap black.
- cleaning the header and footer after removing the plugin.
Expand Down Expand Up @@ -101,13 +124,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- remove backup feature, no need for it.


## 1.5.4
## 1.5.4
- When the database old, tell the user to update.
- fix bug in ACP where secondary menu not appear
- add link to user folder at do.php?id=.. page


## 1.5.3
## 1.5.3
- add turkish language.
- disable ajax by default at ACP ( you can add AJAX_ACP in config.php to turn ajax on )
- some style improvments at ACP
Expand Down
95 changes: 78 additions & 17 deletions admin/Masmak/admin_ban.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,94 @@

<!-- Breadcrumbs -->
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="./">{lang.R_CPINDEX}</a></li>
<li class="breadcrumb-item active">{lang.R_BAN}</li>
<li class="breadcrumb-item"><a href="./">{lang.R_CPINDEX}</a></li>
<li class="breadcrumb-item active">{lang.R_BAN}</li>
</ol>

<div class="card">
<div class="card-body">
{lang.BAN_EXP1}
<br>
{lang.BAN_EXP2}
</div>
<div class="card-body">
{lang.BAN_EXP1}
</div>
</div>

<br>
<div class="d-flex justify-content-end my-2">
<a class="btn btn-primary btn-sm" href="#" data-toggle="modal" data-target="#new_item_form">
<i class="fa fa-plus"></i> {lang.NEW}
</a>
</div>


<IF NAME="show_message">
<div class="alert alert-info alert-dismissible fade show small my-2" role="alert">
{show_message}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true" class="small" style="cursor:pointer">&times;</span>
</button>
</div>
<script>
setTimeout(function() {
$('.alert-dismissible').fadeOut();
}, 5000);
</script>
</IF>

<form method="post" action="{action}" id="ban_form">

<div class="form-group">
<!-- textarea -->
<textarea name="ban_text" class="form-control" rows="2" cols="20" style="width:99%; height: 100px;direction:ltr;">{ban}</textarea>
</div>
<div class="table-responsive-sm">
<table class="table table-striped table-sm">
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">{lang.IP} / {lang.USERNAME}</th>
<th scope="col"></th>
</tr>
</thead>
<tbody>
<LOOP NAME="banned_items">
<tr>
<th scope="row">{{id}}</th>
<td>{{content}}</td>
<td class="d-flex justify-content-end">
<a class="btn btn-outline-danger btn-sm" href="{delete_item}{{del_key}}" title="{lang.DELETE}" onclick="javascript:return confirm_form();">
<i class="fa fa-remove" title="{lang.DELETE}"></i>
</a>
</td>
</tr>
</LOOP>
</tbody>
</table>
</div>

<br>

<input type="submit" name="submit" value="{lang.UPDATE_BAN}" class="btn btn-primary">
<!-- new banned item modal -->
<div id="new_item_form" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="addNewBannedItem"
aria-hidden="true">

<form method="post" action="{new_item_action}">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="addNewBannedItem">{lang.IP} / {lang.USERNAME}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<label class="form-control">
<input type="text" class="form-control" id="k" name="k" placeholder="{lang.IP} {lang.OR} {lang.USERNAME}" value="">
</label>
<small>
{lang.BAN_EXP2}
</small>
{H_FORM_KEYS}
</div>
<div class="modal-footer">

{H_FORM_KEYS}
</form>
<input type="submit" name="submit" class="btn btn-primary" value="{lang.SUBMIT}">
</div>
</div>
</div>
</form>
</div>
<!-- end new banned item modal -->


138 changes: 69 additions & 69 deletions admin/Masmak/admin_calls.html
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@

<!-- Breadcrumbs -->
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="./">{lang.R_CPINDEX}</a></li>
<li class="breadcrumb-item active">{lang.R_CALLS}</li>
<IF NAME="current_smt == 'show_h24'"><li class="breadcrumb-item active"> {lang.SHOW_FROM_24H}</li></IF>
<li class="breadcrumb-item"><a href="./">{lang.R_CPINDEX}</a></li>
<li class="breadcrumb-item active">{lang.R_CALLS}</li>
<IF NAME="current_smt == 'show_h24'"><li class="breadcrumb-item active"> {lang.SHOW_FROM_24H}</li></IF>
</ol>


<IF NAME="no_results">
<div class="alert alert-info">{lang.MESSAGE_NONE}</div>
<div class="alert alert-info">{lang.MESSAGE_NONE}</div>
<ELSE>


<form method="post" name="callform" action="{action}" id="calls_form">


<div id="accordion" role="tablist" aria-multiselectable="true">
<div id="accordion" role="tablist" aria-multiselectable="true">

<LOOP NAME="arr">
<div class="card mb-1" id="su[{{id}}]">
<div class="card-header" role="tab" id="heading{{id}}">
<LOOP NAME="arr">
<div class="card mb-1" id="su[{{id}}]">
<div class="card-header" role="tab" id="heading{{id}}">

<h6 class="mb-0">
<input type="checkbox" class="custom-checkbox" name="del_{{id}}" value="{{id}}" onclick="change_color(this,'su[{{id}}]', 'bg-warning card', 'card');" rel="_del" />
<h6 class="mb-0">
<input type="checkbox" class="custom-checkbox" name="del_{{id}}" value="{{id}}" onclick="change_color(this,'su[{{id}}]', 'bg-warning card', 'card');" rel="_del" />

<a data-toggle="collapse" data-parent="#accordion" href="#collapse{{id}}" aria-expanded="false" aria-controls="collapse{{id}}">
{{name}}
<IF LOOP="sent"><i class="fa fa-reply" title="{lang.IS_SEND_MAIL}" data-toggle="tooltip"></i></IF>
</a>
<small class="pull-(lang.DIR==ltr?right:left)">{{human_time}}</small>
</h6>
<a data-toggle="collapse" data-parent="#accordion" href="#collapse{{id}}" aria-expanded="false" aria-controls="collapse{{id}}">
{{name}}
<IF LOOP="sent"><i class="fa fa-reply" title="{lang.IS_SEND_MAIL}" data-toggle="tooltip"></i></IF>
</a>
<small class="pull-(lang.DIR==ltr?right:left)">{{human_time}}</small>
</h6>

</div>
<div id="collapse{{id}}" class="collapse" role="tabpanel" aria-labelledby="heading{{id}}">
</div>
<div id="collapse{{id}}" class="collapse" role="tabpanel" aria-labelledby="heading{{id}}">

<div class="card-body">
{{text}}
<br>
<br>
____<br>
<IF LOOP="mail"><span class="text-muted">{lang.EMAIL}:</span> {{mail}}<br></IF>
<span class="text-muted">{lang.IP}:</span> <a href="{{ip_finder}}" target="_blank">{{ip}}</a><br>
<span class="text-muted">{lang.TIME}:</span> {{time}}<br>
<IF LOOP="mail">
<hr>
<a class="btn btn-primary" data-toggle="modal" data-target="#contactForm{{id}}" href="#">
{lang.REPLY_CALL}
</a>
</IF>
</div>
<div class="card-body">
{{text}}
<br>
<br>
____<br>
<IF LOOP="mail"><span class="text-muted">{lang.EMAIL}:</span> {{mail}}<br></IF>
<span class="text-muted">{lang.IP}:</span> <a href="{{ip_finder}}" target="_blank">{{ip}}</a><br>
<span class="text-muted">{lang.TIME}:</span> {{time}}<br>
<IF LOOP="mail">
<hr>
<a class="btn btn-primary" data-toggle="modal" data-target="#contactForm{{id}}" href="#">
{lang.REPLY_CALL}
</a>
</IF>
</div>

</div>
</div>
</LOOP>
</div>
</div>
</div>
</LOOP>
</div>


<!-- pagination -->
Expand All @@ -62,45 +62,45 @@ <h6 class="mb-0">

<br>
<div class="row justify-content-between">
<div class="col col-md-auto">[ <a href="javascript:void(0);" onclick="checkAll(document.callform, '_del', 'su', 'card bg-warning mb-1', 'card mb-1');">{lang.CHECK_ALL}</a> ]</div>
<div class="col col-md-auto"><input type="submit" class="btn btn-outline-primary" name="submit" value="{lang.DEL_SELECTED}" /></div>
<div class="col col-md-auto">[ <a href="javascript:void(0);" onclick="checkAll(document.callform, '_del', 'su', 'card bg-warning mb-1', 'card mb-1');">{lang.CHECK_ALL}</a> ]</div>
<div class="col col-md-auto"><input type="submit" class="btn btn-outline-primary" name="submit" value="{lang.DEL_SELECTED}" /></div>
</div>

{H_FORM_KEYS}
</form>

<!-- contact form modals -->
<LOOP NAME="arr">
<div class="modal" id="contactForm{{id}}">
<div class="modal-dialog" role="document">
<div class="modal-content">
<form method="post" action="{action}" id="send_form" role="form">
<div class="modal-header">
<h5 class="modal-title">{lang.REPLY_CALL}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>

<div class="modal-body">
{{text}}
<br>
<br>
____<br>
<IF LOOP="mail"><span class="text-muted">{lang.EMAIL}:</span> {{mail}}<br></IF>
<br>

<textarea name="v_{{id}}" cols="80" class="form-control" rows="3" placeholder="{lang.TEXT}"></textarea>
<input type="hidden" name="reply_submit" value="1">

</div>
<div class="modal-footer">
<button type="submit" name="reply_submit" class="btn btn-primary btn-sm"><span>{lang.REPLY}</span></button>
</div>
</form>
</div>
</div>
</div>
<div class="modal" id="contactForm{{id}}">
<div class="modal-dialog" role="document">
<div class="modal-content">
<form method="post" action="{action}" id="send_form" role="form">
<div class="modal-header">
<h5 class="modal-title">{lang.REPLY_CALL}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>

<div class="modal-body">
{{text}}
<br>
<br>
____<br>
<IF LOOP="mail"><span class="text-muted">{lang.EMAIL}:</span> {{mail}}<br></IF>
<br>

<textarea name="v_{{id}}" cols="80" class="form-control" rows="3" placeholder="{lang.TEXT}"></textarea>
<input type="hidden" name="reply_submit" value="1">

</div>
<div class="modal-footer">
<button type="submit" name="reply_submit" class="btn btn-primary btn-sm"><span>{lang.REPLY}</span></button>
</div>
</form>
</div>
</div>
</div>

</LOOP>

Expand Down
11 changes: 7 additions & 4 deletions admin/Masmak/admin_check_update.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

<!-- Breadcrumbs -->
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="./">{lang.R_CPINDEX}</a></li>
<li class="breadcrumb-item active">{lang.R_CHECK_UPDATE}</li>
<li class="breadcrumb-item"><a href="./">{lang.R_CPINDEX}</a></li>
<li class="breadcrumb-item active">{lang.R_CHECK_UPDATE}</li>
</ol>

<div class="alert" id="updateInfo">
Expand Down Expand Up @@ -69,7 +69,9 @@ <h4 class="d-inline px-2">3</h4> {lang.UPDATE_PROCESS_STEP3}
.done(function (data) {
if(data.content) {
var info = data.content.split(":::");
$('#updateInfo').addClass(info[0] != 0 ? 'alert-warning' : 'alert-info');
$('#updateInfo').addClass(
info[0] != 0 ? 'alert-warning' : 'alert-info'
);
$('#updateInfoStatus').html(info[1]);
<UNLESS NAME="showMessage">
if(info[0] == 2) {
Expand Down Expand Up @@ -128,9 +130,10 @@ <h4 class="d-inline px-2">3</h4> {lang.UPDATE_PROCESS_STEP3}
}
})
.fail(function(data) {
var tryAgainMsg = '{lang.ERROR_TRY_AGAIN}';
$('#update'+step+' .update-status').html('<i class="fa fa-warning text-danger"></i>');
$('#update'+step+' .update-message').removeClass('d-none').addClass('d-block').html(
(data.content ? data.content : (data.responseJSON ? data.responseJSON.content : '{lang.ERROR_TRY_AGAIN}'))
<IGNORE>(data.content ? data.content : (data.responseJSON ? data.responseJSON.content : tryAgainMsg))</IGNORE>
);
});
}
Expand Down
Loading

0 comments on commit b3204ee

Please sign in to comment.