diff --git a/README.md b/README.md
index 332921cf..1bb0f9d4 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,14 @@
-
+
# Bugfish Framework Documentation
**Repository:** [Bugfish Framework on GitHub](https://github.com/bugfishtm/bugfish-framework)
**Documentation:** [Bugfish Framework Documentation](https://bugfishtm.github.io/bugfish-framework/)
-
+
**Comprehensive Documentation Available:** The Bugfish Framework project is proud to provide a detailed documentation that elucidates every function and class within the framework. This extensive documentation can be found at [bugfish-github.de](https://bugfishtm.github.io/bugfish-framework/) and offers invaluable insights into the operation of each component.
@@ -79,7 +79,7 @@ Explore an array of JavaScript functions designed for universal integration acro
If you want to support us, include this image somewhere in your project, that people can see this project has been created with help of this framework:
-
+
## Get Support
diff --git a/_framework/README.md b/_framework/README.md
index 059db39c..fe754f18 100644
--- a/_framework/README.md
+++ b/_framework/README.md
@@ -3,14 +3,14 @@
-
+
# Bugfish Framework Documentation
**Repository:** [Bugfish Framework on GitHub](https://github.com/bugfishtm/bugfish-framework)
**Documentation:** [Bugfish Framework Documentation](https://bugfishtm.github.io/bugfish-framework/)
-
+
**Comprehensive Documentation Available:** The Bugfish Framework project is proud to provide a detailed documentation that elucidates every function and class within the framework. This extensive documentation can be found at [bugfish-github.de](https://bugfishtm.github.io/bugfish-framework/) and offers invaluable insights into the operation of each component.
@@ -79,7 +79,7 @@ Explore an array of JavaScript functions designed for universal integration acro
If you want to support us, include this image somewhere in your project, that people can see this project has been created with help of this framework:
-
+
## Get Support
diff --git a/_framework/banner.jpg b/_framework/banner.jpg
deleted file mode 100644
index e5ff85c6..00000000
Binary files a/_framework/banner.jpg and /dev/null differ
diff --git a/_framework/bugfish-framework-banner.jpg b/_framework/bugfish-framework-banner.jpg
new file mode 100644
index 00000000..c8a65432
Binary files /dev/null and b/_framework/bugfish-framework-banner.jpg differ
diff --git a/_framework/logo.jpg b/_framework/bugfish-framework-logo-small.jpg
similarity index 100%
rename from _framework/logo.jpg
rename to _framework/bugfish-framework-logo-small.jpg
diff --git a/_images/logo_full.jpg b/_framework/bugfish-framework-logo.jpg
similarity index 100%
rename from _images/logo_full.jpg
rename to _framework/bugfish-framework-logo.jpg
diff --git a/_framework/classes/x_class_mail.php b/_framework/classes/x_class_mail.php
index ead646ff..a4cd1d5e 100644
--- a/_framework/classes/x_class_mail.php
+++ b/_framework/classes/x_class_mail.php
@@ -97,8 +97,7 @@ function __construct($host, $port = 25, $auth_type = false, $user = false, $pass
// Execute Mail Logging if Needed
private function log_execute($subject, $content, $receiver, $attachments, $cc, $bcc, $success, $debug_message, $settings) {
if($this->l_active) { if($success) { $success = 1; }
- else { $success = 0; }
- if($success AND $this->l_ok) { return false; }
+ else { $success = 0; } if($success AND !$this->l_ok) { return false; }
$b[0]["type"] = "s";
$b[0]["value"] = @serialize(@$receiver);
$b[1]["type"] = "s";
@@ -182,7 +181,7 @@ public function send($to, $toname, $title, $mailContent, $ishtml = false, $FOOTE
return true;
} else {
// Mail Sending Fail
- $this->log_execute($title, $realcontent, $to, $attachments, array(), array(), true, $tmp_mailer->ErrorInfo, false);
+ $this->log_execute($title, $realcontent, $to, $attachments, array(), array(), false, $tmp_mailer->ErrorInfo, false);
$this->set_info($tmp_mailer->ErrorInfo);
unset($tmp_mailer);
return false;
diff --git a/_framework/classes/x_class_user.php b/_framework/classes/x_class_user.php
index e0dde2d0..960b1899 100644
--- a/_framework/classes/x_class_user.php
+++ b/_framework/classes/x_class_user.php
@@ -80,6 +80,8 @@ public function login_field_mail() { $this->login_field = "user_mail"; $this->ma
public function mail_unique($bool = false) { $this->mail_unique = $bool; }
private $user_unique = false; // User dont have to be unique if not in reference
public function user_unique($bool = false) { $this->user_unique = $bool; }
+ private $spoof_check = false; // Enable IP Checking in Sessions for Hijacking Prevention?
+ public function ip_spoof_check($bool = true) { $this->spoof_check = $bool; }
## Logging Setup
private $log_ip=false; // Log IP Adresses?
public function log_ip($bool=false){$this->log_ip = $bool;}
@@ -533,7 +535,17 @@ public function logout() { @$this->session_logout(); @$this->cookie_unset();
public function init() {
if($this->login_field == "user_name") { $this->user_unique = true; }
if($this->login_field == "user_mail") { $this->mail_unique = true; }
- if(@$_SESSION[$this->sessions."x_users_ip"] == @$_SERVER["REMOTE_ADDR"]
+ $internal_ip_check = $this->spoof_check;
+ if($internal_ip_check) {
+ if(@$_SESSION[$this->sessions."x_users_ip"] == @$_SERVER["REMOTE_ADDR"]) {
+ $internal_ip_check = true;
+ } else {
+ $internal_ip_check = false;
+ }
+ } else {
+ $internal_ip_check = true;
+ }
+ if($internal_ip_check
AND isset($_SESSION[$this->sessions."x_users_key"])
AND is_bool($_SESSION[$this->sessions."x_users_stay"])
AND is_numeric($_SESSION[$this->sessions."x_users_id"])) {
diff --git a/_framework/classes/x_class_version.php b/_framework/classes/x_class_version.php
index 42e2c441..aee3b0d7 100644
--- a/_framework/classes/x_class_version.php
+++ b/_framework/classes/x_class_version.php
@@ -28,6 +28,6 @@ class x_class_version {
public $contact = "request@bugfish.eu";
public $website = "https://www.bugfish.eu";
public $github = "https://github.com/bugfishtm";
- public $version = "3.10";
+ public $version = "3.20";
public $beta = false;
}
diff --git a/_images/banner.jpg b/_images/banner.jpg
deleted file mode 100644
index e5ff85c6..00000000
Binary files a/_images/banner.jpg and /dev/null differ
diff --git a/_images/bugfish-framework-banner.jpg b/_images/bugfish-framework-banner.jpg
index e5ff85c6..c8a65432 100644
Binary files a/_images/bugfish-framework-banner.jpg and b/_images/bugfish-framework-banner.jpg differ
diff --git a/_images/logo.jpg b/_images/bugfish-framework-logo-small.jpg
similarity index 100%
rename from _images/logo.jpg
rename to _images/bugfish-framework-logo-small.jpg
diff --git a/_releases/3.20.zip b/_releases/3.20.zip
new file mode 100644
index 00000000..0963b2d2
Binary files /dev/null and b/_releases/3.20.zip differ
diff --git a/docs/assets/css/stylesheet.css b/docs/assets/css/stylesheet.css
index 82dd1bb6..a5ae3e1d 100644
--- a/docs/assets/css/stylesheet.css
+++ b/docs/assets/css/stylesheet.css
@@ -240,4 +240,5 @@ h1, h2, h3 {
background: #242424 !important;
}
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
diff --git a/docs/bugfish-framework-banner.jpg b/docs/bugfish-framework-banner.jpg
index e5ff85c6..c8a65432 100644
Binary files a/docs/bugfish-framework-banner.jpg and b/docs/bugfish-framework-banner.jpg differ
diff --git a/docs/classes/x_class_api.html b/docs/classes/x_class_api.html
index 1278e7d0..06cba6df 100644
--- a/docs/classes/x_class_api.html
+++ b/docs/classes/x_class_api.html
@@ -20,7 +20,7 @@
-
+
PHP API Class - Bugfish Documentations
diff --git a/docs/classes/x_class_benchmark.html b/docs/classes/x_class_benchmark.html
index 6d7bddc8..2bc0823c 100644
--- a/docs/classes/x_class_benchmark.html
+++ b/docs/classes/x_class_benchmark.html
@@ -20,7 +20,7 @@
-
+
PHP Benchmark Class - Bugfish Documentations
diff --git a/docs/classes/x_class_block.html b/docs/classes/x_class_block.html
index a1291472..36879a99 100644
--- a/docs/classes/x_class_block.html
+++ b/docs/classes/x_class_block.html
@@ -20,7 +20,7 @@
-
+
PHP Block Class - Bugfish Documentations
diff --git a/docs/classes/x_class_comment.html b/docs/classes/x_class_comment.html
index c0aca7f1..6dc16a2a 100644
--- a/docs/classes/x_class_comment.html
+++ b/docs/classes/x_class_comment.html
@@ -20,7 +20,7 @@
-
+
PHP Comment Class - Bugfish Documentations
diff --git a/docs/classes/x_class_crypt.html b/docs/classes/x_class_crypt.html
index b3e43f96..fcb8731b 100644
--- a/docs/classes/x_class_crypt.html
+++ b/docs/classes/x_class_crypt.html
@@ -20,7 +20,7 @@
-
+
PHP Crypt Class - Bugfish Documentations
diff --git a/docs/classes/x_class_csrf.html b/docs/classes/x_class_csrf.html
index 4985adc3..67670cc0 100644
--- a/docs/classes/x_class_csrf.html
+++ b/docs/classes/x_class_csrf.html
@@ -20,7 +20,7 @@
-
+
PHP CSRF Class - Bugfish Documentations
diff --git a/docs/classes/x_class_curl.html b/docs/classes/x_class_curl.html
index 66c18871..9ca43e2c 100644
--- a/docs/classes/x_class_curl.html
+++ b/docs/classes/x_class_curl.html
@@ -20,7 +20,7 @@
-
+
PHP CURL Class - Bugfish Documentations
diff --git a/docs/classes/x_class_debug.html b/docs/classes/x_class_debug.html
index 164e2a53..66088527 100644
--- a/docs/classes/x_class_debug.html
+++ b/docs/classes/x_class_debug.html
@@ -20,7 +20,7 @@
-
+
PHP Debug Class - Bugfish Documentations
diff --git a/docs/classes/x_class_eventbox.html b/docs/classes/x_class_eventbox.html
index 6545801e..0838b517 100644
--- a/docs/classes/x_class_eventbox.html
+++ b/docs/classes/x_class_eventbox.html
@@ -20,7 +20,7 @@
-
+
PHP Eventbox Class - Bugfish Documentations
diff --git a/docs/classes/x_class_hitcounter.html b/docs/classes/x_class_hitcounter.html
index d1bbb32f..1709b9d7 100644
--- a/docs/classes/x_class_hitcounter.html
+++ b/docs/classes/x_class_hitcounter.html
@@ -20,7 +20,7 @@
-
+
PHP Hitcounter Class - Bugfish Documentations
diff --git a/docs/classes/x_class_ipbl.html b/docs/classes/x_class_ipbl.html
index 886db2bb..564f6ac1 100644
--- a/docs/classes/x_class_ipbl.html
+++ b/docs/classes/x_class_ipbl.html
@@ -20,7 +20,7 @@
-
+
PHP Blacklist Class - Bugfish Documentations
diff --git a/docs/classes/x_class_lang.html b/docs/classes/x_class_lang.html
index 441c2314..c815f60b 100644
--- a/docs/classes/x_class_lang.html
+++ b/docs/classes/x_class_lang.html
@@ -20,7 +20,7 @@
-
+
PHP Lang Class - Bugfish Documentations
diff --git a/docs/classes/x_class_log.html b/docs/classes/x_class_log.html
index 2956c85a..684396e1 100644
--- a/docs/classes/x_class_log.html
+++ b/docs/classes/x_class_log.html
@@ -20,7 +20,7 @@
-
+
PHP Log Class - Bugfish Documentations
diff --git a/docs/classes/x_class_mail.html b/docs/classes/x_class_mail.html
index c40a4b5e..aa03f791 100644
--- a/docs/classes/x_class_mail.html
+++ b/docs/classes/x_class_mail.html
@@ -20,7 +20,7 @@
-
+
PHP Mail Class - Bugfish Documentations
diff --git a/docs/classes/x_class_mail_template.html b/docs/classes/x_class_mail_template.html
index c7ebaedf..10a34f1e 100644
--- a/docs/classes/x_class_mail_template.html
+++ b/docs/classes/x_class_mail_template.html
@@ -20,7 +20,7 @@
-
+
PHP Mail Template Class - Bugfish Documentations
diff --git a/docs/classes/x_class_mysql.html b/docs/classes/x_class_mysql.html
index 6ecfb01c..5936184f 100644
--- a/docs/classes/x_class_mysql.html
+++ b/docs/classes/x_class_mysql.html
@@ -20,7 +20,7 @@
-
+
PHP MySQL Class - Bugfish Documentations
diff --git a/docs/classes/x_class_perm.html b/docs/classes/x_class_perm.html
index 5b18a047..495d6a2f 100644
--- a/docs/classes/x_class_perm.html
+++ b/docs/classes/x_class_perm.html
@@ -20,7 +20,7 @@
-
+
PHP Perm Class - Bugfish Documentations
diff --git a/docs/classes/x_class_redis.html b/docs/classes/x_class_redis.html
index c3b641a3..28743cbc 100644
--- a/docs/classes/x_class_redis.html
+++ b/docs/classes/x_class_redis.html
@@ -20,7 +20,7 @@
-
+
PHP Redis Class - Bugfish Documentations
diff --git a/docs/classes/x_class_referer.html b/docs/classes/x_class_referer.html
index 7b48c6f7..8e393dd1 100644
--- a/docs/classes/x_class_referer.html
+++ b/docs/classes/x_class_referer.html
@@ -20,7 +20,7 @@
-
+
PHP Referer Class - Bugfish Documentations
diff --git a/docs/classes/x_class_table.html b/docs/classes/x_class_table.html
index ea42eac7..f1c227de 100644
--- a/docs/classes/x_class_table.html
+++ b/docs/classes/x_class_table.html
@@ -20,7 +20,7 @@
-
+
PHP Table Class - Bugfish Documentations
diff --git a/docs/classes/x_class_user.html b/docs/classes/x_class_user.html
index c401205f..261b9afa 100644
--- a/docs/classes/x_class_user.html
+++ b/docs/classes/x_class_user.html
@@ -20,7 +20,7 @@
-
+
PHP User Class - Bugfish Documentations
diff --git a/docs/classes/x_class_var.html b/docs/classes/x_class_var.html
index 26c22f10..aa32ee25 100644
--- a/docs/classes/x_class_var.html
+++ b/docs/classes/x_class_var.html
@@ -20,7 +20,7 @@
-
+
PHP Var Class - Bugfish Documentations
diff --git a/docs/classes/x_class_zip.html b/docs/classes/x_class_zip.html
index 9c61e7f1..b3fc51e7 100644
--- a/docs/classes/x_class_zip.html
+++ b/docs/classes/x_class_zip.html
@@ -20,7 +20,7 @@
-
+
PHP ZIP Class - Bugfish Documentations
diff --git a/docs/index.html b/docs/index.html
index 76f61a1d..d370d464 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -20,7 +20,7 @@
-
+
Bugfish Framework - Bugfish Documentations