Skip to content

General fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phpipam merged 4 commits into from
May 16, 2026
Merged

General fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d16f6b7
Url rewrites
May 15, 2026
1796470
pcntl is not available via GUI
May 15, 2026
efd30bd
Db uses int, code uses str
May 15, 2026
9aaf464
Submodules
May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
db/bkp
config.php
functions/assets
.claude
.claude
14 changes: 14 additions & 0 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<IfModule mod_rewrite.c>

# Enable rewrite engine
RewriteEngine on
# Passthroughs
RewriteRule ^(css|js|route|test)/.*$ - [L,QSA]

# Rewrites
RewriteRule ^index\.php$ - [L]
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]

</IfModule>
1 change: 1 addition & 0 deletions functions/assets/Net_DNS2
Open in desktop
Submodule Net_DNS2 added at 37dcff
1 change: 1 addition & 0 deletions functions/assets/PHPMailer
Open in desktop
Submodule PHPMailer added at e193b9
4 changes: 2 additions & 2 deletions functions/autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function load_translations ($Database)
$testssl_available = file_exists(dirname(__FILE__)."/../functions/testSSL/testssl.sh");

# required extensions
$required_extensions = ['curl', 'openssl', 'pcntl', 'posix', 'pdo', 'pdo_mysql', 'session', 'hash'];
$required_extensions = ['curl', 'openssl', 'posix', 'pdo', 'pdo_mysql', 'session', 'hash'];
$missing_extensions = php_feature_missing_all ($required_extensions);

if (sizeof($missing_extensions)>0)
Expand Down Expand Up @@ -244,4 +244,4 @@ function load_translations ($Database)
$_params = ['tenant'=>'error', "route"=>"generic"];
}
}
}
}
5 changes: 3 additions & 2 deletions functions/classes/class.User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ public function save_current_user()
$this->errors[] = $e->getMessage();
$this->result_die();
}
$user->admin = strval($user->admin);
// save
if ($user != null) {
$this->user = $user;
Expand Down Expand Up @@ -429,7 +430,7 @@ public function validate_session($require_admin = false, $is_popup = false, $is_
}
}
// not admin
elseif ($require_admin && $this->user->admin != 1) {
elseif ($require_admin && $this->user->admin != "1") {
if ($is_popup && !$is_popup_result) {
global $Modal;
$Modal->modal_print("Error", "<div class='alert alert-danger'>" . _("Administrative privileges required") . ".</div>", "", false, "danger");
Expand Down Expand Up @@ -679,4 +680,4 @@ function setResult($Result): self
$this->Result = $Result;
return $this;
}
}
}