Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e910fc6

Browse files
stamparmstamparm
committed
Some more things regarding #4269 
1 parent 6375f9e commit e910fc6

7 files changed

Lines changed: 153 additions & 163 deletions

File tree

‎data/html/index.html‎

Lines changed: 147 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,151 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22

33
<!-- http://angrytools.com/bootstrap/editor/ -->
44

5-
<html lang="en">
6-
<head>
7-
<meta charset="utf-8">
8-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9-
<meta name="viewport" content="width=device-width, initial-scale=1">
10-
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
11-
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap-theme.min.css" rel="stylesheet">
12-
13-
<!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
14-
</head>
15-
<body>
16-
<style>
17-
#wrapper { width: 100%; }
18-
19-
#page-wrapper {
20-
padding: 0 15px;
21-
min-height: 568px;
22-
background-color: #fff;
23-
}
24-
25-
@media(min-width:768px) {
26-
#page-wrapper {
27-
position: inherit;
28-
margin: 0 0 0 250px;
29-
padding: 0 30px;
30-
border-left: 1px solid #e7e7e7;
31-
}
32-
}
33-
34-
.sidebar .sidebar-nav.navbar-collapse { padding-right: 0; padding-left: 0; }
35-
.sidebar .sidebar-search { padding: 15px; }
36-
.sidebar ul li { border-bottom: 1px solid #e7e7e7; }
37-
38-
.sidebar ul li a.active { background-color: #eee; }
39-
40-
.sidebar .arrow { float: right;}
41-
.sidebar .fa.arrow:before { content: "f104";}
42-
.sidebar .active>a>.fa.arrow:before { content: "f107"; }
43-
.sidebar .nav-second-level li,
44-
.sidebar .nav-third-level li {
45-
border-bottom: 0!important;
46-
}
47-
48-
.sidebar .nav-second-level li a { padding-left: 37px; }
49-
.sidebar .nav-third-level li a { padding-left: 52px; }
50-
51-
@media(min-width:768px) {
52-
.sidebar {
53-
z-index: 1;
54-
position: absolute;
55-
width: 250px;
56-
margin-top: 51px;
57-
}
58-
}
59-
</style>
60-
<div id="wrapper">
61-
62-
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
63-
<div class="navbar-header">
64-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
65-
<span class="sr-only">Toggle navigation</span>
66-
<span class="icon-bar"></span>
67-
<span class="icon-bar"></span>
68-
<span class="icon-bar"></span>
69-
</button>
70-
<a class="navbar-brand" href="index.html">sqlmap</a>
71-
</div>
72-
73-
<div class="navbar-default sidebar" role="navigation">
74-
<div class="sidebar-nav navbar-collapse">
75-
<ul class="nav" id="side-menu">
76-
<li>
77-
<a href="#"><i class="glyphicon glyphicon-home"></i> Options<span class="arrow"></span></a>
78-
<ul class="nav nav-second-level">
79-
<li><a>Target</a></li>
80-
<li><a>Request</a></li>
81-
<li><a>Optimization</a></li>
82-
<li><a>Injection</a></li>
83-
<li><a>Detection</a></li>
84-
<li><a>Techniques</a></li>
85-
<li><a>Fingerprint</a></li>
86-
<li><a>Enumeration</a></li>
87-
<li><a>Brute force</a></li>
88-
<li><a>User-defined function injection</a></li>
89-
<li><a>File system access</a></li>
90-
<li><a>Operating system access</a></li>
91-
<li><a>Windows registry access</a></li>
92-
<li><a>General</a></li>
93-
<li><a>Miscellaneous</a></li>
94-
</ul>
95-
</li>
96-
</ul>
97-
</div>
98-
</div>
99-
</nav>
100-
101-
<div id="page-wrapper">
102-
<div class="row">
103-
<h4>DEMO</h4>
104-
</div>
105-
</div>
106-
</div>
107-
<script>
108-
/*
109-
* metismenu - v1.0.3
110-
* Easy menu jQuery plugin for Twitter Bootstrap 3
111-
* https://github.com/onokumus/metisMenu
112-
*
113-
* Made by Osman Nuri Okumuş
114-
* Under MIT License
115-
*/
116-
!function(a,b,c){function d(b,c){this.element=b,this.settings=a.extend({},f,c),this._defaults=f,this._name=e,this.init()}var e="metisMenu",f={toggle:!0};d.prototype={init:function(){var b=a(this.element),c=this.settings.toggle;this.isIE()<=9?(b.find("li.active").has("ul").children("ul").collapse("show"),b.find("li").not(".active").has("ul").children("ul").collapse("hide")):(b.find("li.active").has("ul").children("ul").addClass("collapse in"),b.find("li").not(".active").has("ul").children("ul").addClass("collapse")),b.find("li").has("ul").children("a").on("click",function(b){b.preventDefault(),a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),c&&a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")})},isIE:function(){for(var a,b=3,d=c.createElement("div"),e=d.getElementsByTagName("i");d.innerHTML="<!--[if gt IE "+ ++b+"]><i></i><![endif]-->",e[0];)return b>4?b:a}},a.fn[e]=function(b){return this.each(function(){a.data(this,"plugin_"+e)||a.data(this,"plugin_"+e,new d(this,b))})}}(jQuery,window,document);
117-
118-
$(function() {
119-
120-
$('#side-menu').metisMenu();
121-
122-
});
123-
124-
//Loads the correct sidebar on window load,
125-
//collapses the sidebar on window resize.
126-
// Sets the min-height of #page-wrapper to window size
127-
$(function() {
128-
$(window).bind("load resize", function() {
129-
topOffset = 50;
130-
width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;
131-
if (width < 768) {
132-
$('div.navbar-collapse').addClass('collapse')
133-
topOffset = 100; // 2-row-menu
134-
} else {
135-
$('div.navbar-collapse').removeClass('collapse')
136-
}
137-
138-
height = (this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height;
139-
height = height - topOffset;
140-
if (height < 1) height = 1;
141-
if (height > topOffset) {
142-
$("#page-wrapper").css("min-height", (height) + "px");
143-
}
144-
})
145-
});
146-
</script>
147-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
148-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
149-
</body>
5+
<html lang="en">
6+
<head>
7+
<title>DEMO</title>
8+
<meta charset="utf-8">
9+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10+
<meta name="viewport" content="width=device-width, initial-scale=1">
11+
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
12+
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap-theme.min.css" rel="stylesheet">
13+
14+
<!--[if lt IE 9]><script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script><script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
15+
</head>
16+
<body>
17+
<style>
18+
#wrapper { width: 100%; }
19+
20+
#page-wrapper {
21+
padding: 0 15px;
22+
min-height: 568px;
23+
background-color: #fff;
24+
}
25+
26+
@media(min-width:768px) {
27+
#page-wrapper {
28+
position: inherit;
29+
margin: 0 0 0 250px;
30+
padding: 0 30px;
31+
border-left: 1px solid #e7e7e7;
32+
}
33+
}
34+
35+
.sidebar .sidebar-nav.navbar-collapse { padding-right: 0; padding-left: 0; }
36+
.sidebar .sidebar-search { padding: 15px; }
37+
.sidebar ul li { border-bottom: 1px solid #e7e7e7; }
38+
39+
.sidebar ul li a.active { background-color: #eee; }
40+
41+
.sidebar .arrow { float: right;}
42+
.sidebar .fa.arrow:before { content: "f104";}
43+
.sidebar .active>a>.fa.arrow:before { content: "f107"; }
44+
.sidebar .nav-second-level li,
45+
.sidebar .nav-third-level li {
46+
border-bottom: 0!important;
47+
}
48+
49+
.sidebar .nav-second-level li a { padding-left: 37px; }
50+
.sidebar .nav-third-level li a { padding-left: 52px; }
51+
52+
@media(min-width:768px) {
53+
.sidebar {
54+
z-index: 1;
55+
position: absolute;
56+
width: 250px;
57+
margin-top: 51px;
58+
}
59+
}
60+
</style>
61+
<div id="wrapper">
62+
63+
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
64+
<div class="navbar-header">
65+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
66+
<span class="sr-only">Toggle navigation</span>
67+
<span class="icon-bar"></span>
68+
<span class="icon-bar"></span>
69+
<span class="icon-bar"></span>
70+
</button>
71+
<a class="navbar-brand" href="index.html">sqlmap</a>
72+
</div>
73+
74+
<div class="navbar-default sidebar" role="navigation">
75+
<div class="sidebar-nav navbar-collapse">
76+
<ul class="nav" id="side-menu">
77+
<li>
78+
<a href="#"><em class="glyphicon glyphicon-home"></em> Options<span class="arrow"></span></a>
79+
<ul class="nav nav-second-level">
80+
<li><a>Target</a></li>
81+
<li><a>Request</a></li>
82+
<li><a>Optimization</a></li>
83+
<li><a>Injection</a></li>
84+
<li><a>Detection</a></li>
85+
<li><a>Techniques</a></li>
86+
<li><a>Fingerprint</a></li>
87+
<li><a>Enumeration</a></li>
88+
<li><a>Brute force</a></li>
89+
<li><a>User-defined function injection</a></li>
90+
<li><a>File system access</a></li>
91+
<li><a>Operating system access</a></li>
92+
<li><a>Windows registry access</a></li>
93+
<li><a>General</a></li>
94+
<li><a>Miscellaneous</a></li>
95+
</ul>
96+
</li>
97+
</ul>
98+
</div>
99+
</div>
100+
</nav>
101+
102+
<div id="page-wrapper">
103+
<div class="row">
104+
<h4>DEMO</h4>
105+
</div>
106+
</div>
107+
</div>
108+
<script>
109+
/*
110+
* metismenu - v1.0.3
111+
* Easy menu jQuery plugin for Twitter Bootstrap 3
112+
* https://github.com/onokumus/metisMenu
113+
*
114+
* Made by Osman Nuri Okumuş
115+
* Under MIT License
116+
*/
117+
!function(a,b,c){function d(b,c){this.element=b,this.settings=a.extend({},f,c),this._defaults=f,this._name=e,this.init()}var e="metisMenu",f={toggle:!0};d.prototype={init:function(){var b=a(this.element),c=this.settings.toggle;this.isIE()<=9?(b.find("li.active").has("ul").children("ul").collapse("show"),b.find("li").not(".active").has("ul").children("ul").collapse("hide")):(b.find("li.active").has("ul").children("ul").addClass("collapse in"),b.find("li").not(".active").has("ul").children("ul").addClass("collapse")),b.find("li").has("ul").children("a").on("click",function(b){b.preventDefault(),a(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),c&&a(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")})},isIE:function(){for(var a,b=3,d=c.createElement("div"),e=d.getElementsByTagName("i");d.innerHTML="<!--[if gt IE "+ ++b+"]><i></i><![endif]-->",e[0];)return b>4?b:a}},a.fn[e]=function(b){return this.each(function(){a.data(this,"plugin_"+e)||a.data(this,"plugin_"+e,new d(this,b))})}}(jQuery,window,document);
118+
119+
$(function() {
120+
121+
$('#side-menu').metisMenu();
122+
123+
});
124+
125+
//Loads the correct sidebar on window load,
126+
//collapses the sidebar on window resize.
127+
// Sets the min-height of #page-wrapper to window size
128+
$(function() {
129+
$(window).bind("load resize", function() {
130+
topOffset = 50;
131+
width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;
132+
if (width < 768) {
133+
$('div.navbar-collapse').addClass('collapse')
134+
topOffset = 100; // 2-row-menu
135+
} else {
136+
$('div.navbar-collapse').removeClass('collapse')
137+
}
138+
139+
height = (this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height;
140+
height = height - topOffset;
141+
if (height < 1) height = 1;
142+
if (height > topOffset) {
143+
$("#page-wrapper").css("min-height", (height) + "px");
144+
}
145+
})
146+
});
147+
</script>
148+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
149+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
150+
</body>
150151
</html>

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from thirdparty.six import unichr as _unichr
1919

2020
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
21-
VERSION = "1.4.7.11"
21+
VERSION = "1.4.7.12"
2222
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2323
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2424
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

‎lib/request/redirecthandler.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ def _(self, length=None):
163163
retVal = getSafeExString(ex)
164164
except:
165165
retVal = ""
166-
finally:
167-
return retVal
166+
return retVal
168167

169168
result.read = types.MethodType(_, result)
170169

‎thirdparty/bottle/bottle.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ def reset(self):
570570

571571
def prepare(self):
572572
""" Do all on-demand work immediately (useful for debugging)."""
573-
self.call
573+
self.call()
574574

575575
def all_plugins(self):
576576
""" Yield all Plugins affecting this route. """
@@ -1518,7 +1518,7 @@ def __setattr__(self, name, value):
15181518
raise AttributeError("Attribute already defined: %s" % name)
15191519
self.environ[key] = value
15201520

1521-
def __delattr__(self, name, value):
1521+
def __delattr__(self, name):
15221522
try:
15231523
del self.environ['bottle.request.ext.%s' % name]
15241524
except KeyError:

‎thirdparty/clientform/clientform.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ def _set_selected_state(self, item, action):
19301930
raise AttributeError("control '%s' is disabled" % self.name)
19311931
if self.readonly:
19321932
raise AttributeError("control '%s' is readonly" % self.name)
1933-
action == bool(action)
1933+
action = bool(action)
19341934
compat = self._form.backwards_compat
19351935
if not compat and item.disabled:
19361936
raise AttributeError("item is disabled")

‎thirdparty/gprof2dot/gprof2dot.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,16 +1271,6 @@ def parse_key(self, key):
12711271
return None
12721272
key, value = pair
12731273
return value
1274-
line = self.lookahead()
1275-
mo = self._key_re.match(line)
1276-
if not mo:
1277-
return None
1278-
key, value = line.split(':', 1)
1279-
if key not in keys:
1280-
return None
1281-
value = value.strip()
1282-
self.consume()
1283-
return key, value
12841274

12851275
def parse_keys(self, keys):
12861276
line = self.lookahead()

‎thirdparty/xdot/xdot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ def handle_font(self, size, name):
722722
def handle_font_characteristics(self, flags):
723723
# TODO
724724
if flags != 0:
725-
sys.stderr.write("warning: font characteristics not supported yet\n" % op)
725+
sys.stderr.write("warning: font characteristics not supported yet\n")
726726

727727
def handle_text(self, x, y, j, w, t):
728728
self.shapes.append(TextShape(self.pen, x, y, j, w, t))

0 commit comments

Comments
 (0)