vmario/YOURLS-AuthMgrPlus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check of constant YOURLS_USER via defined function. Changed hook to activated_plugin in amp_activated function. Previously hook was not working in a docker deploy

Browse Source
This commit is contained in:
rizlas 2021-10-19 21:42:01 +02:00
parent d7d5d00b78
commit 16e7899a63
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
authMgrPlus/plugin.php
View File

@ -266,7 +266,7 @@ function amp_have_capability( $capability ) {
if ( !amp_is_valid_user() ) //XXX if ( !amp_is_valid_user() ) //XXX
return false; return false;
// List capabilities of particular user role // List capabilities of particular user role
$user = YOURLS_USER !== false ? YOURLS_USER : NULL; $user = defined('YOURLS_USER') ? YOURLS_USER : NULL;
$user_caps = array(); $user_caps = array();
foreach ( $amp_role_capabilities as $rolename => $rolecaps ) { foreach ( $amp_role_capabilities as $rolename => $rolecaps ) {
if ( amp_user_has_role( $user, $rolename ) ) { if ( amp_user_has_role( $user, $rolename ) ) {
@ -329,7 +329,7 @@ function amp_admin_list_where($where) {
if ( amp_have_capability( ampCap::ViewAll ) ) if ( amp_have_capability( ampCap::ViewAll ) )
return $where; // Allow admin/editor users to see the lot. return $where; // Allow admin/editor users to see the lot.
$user = YOURLS_USER !== false ? YOURLS_USER : NULL; $user = defined('YOURLS_USER') ? YOURLS_USER : NULL;
$where['sql'] = $where['sql'] . " AND (`user` = :user OR `user` IS NULL) "; $where['sql'] = $where['sql'] . " AND (`user` = :user OR `user` IS NULL) ";
$where['binds']['user'] = $user; $where['binds']['user'] = $user;
@ -375,7 +375,7 @@ function amp_get_db_stats( $return, $where ) {
// or... filter results // or... filter results
global $ydb; global $ydb;
$table_url = YOURLS_DB_TABLE_URL; $table_url = YOURLS_DB_TABLE_URL;
$user = YOURLS_USER !== false ? YOURLS_USER : NULL; $user = defined('YOURLS_USER') ? YOURLS_USER : NULL;
$where['sql'] = $where['sql'] . " AND (`user` = :user OR `user` IS NULL) "; $where['sql'] = $where['sql'] . " AND (`user` = :user OR `user` IS NULL) ";
$where['binds']['user'] = $user; $where['binds']['user'] = $user;
@ -483,7 +483,7 @@ function amp_env_check() {
} }
// Activation: add the user column to the URL table if not added // Activation: add the user column to the URL table if not added
yourls_add_action( 'activated_authMgrPlus/plugin.php', 'amp_activated' ); yourls_add_action('activated_plugin', 'amp_activated');
function amp_activated() { function amp_activated() {
global $ydb; global $ydb;
@ -564,7 +564,7 @@ function amp_manage_keyword( $keyword, $capability ) {
$return = false; // default is to deny access $return = false; // default is to deny access
if ( amp_is_valid_user() ) { // only authenticated users can manaage keywords if ( amp_is_valid_user() ) { // only authenticated users can manaage keywords
$owner = amp_keyword_owner($keyword); $owner = amp_keyword_owner($keyword);
$user = YOURLS_USER !== false ? YOURLS_USER : NULL; $user = defined('YOURLS_USER') ? YOURLS_USER : NULL;
if ( amp_have_capability( ampCap::ManageUsrsURL ) // Admin? if ( amp_have_capability( ampCap::ManageUsrsURL ) // Admin?
|| ( $owner === NULL && amp_have_capability( ampCap::ManageAnonURL ) ) // Editor? || ( $owner === NULL && amp_have_capability( ampCap::ManageAnonURL ) ) // Editor?
|| ( $owner === $user && amp_have_capability( $capability ) ) ) // Self Edit? || ( $owner === $user && amp_have_capability( $capability ) ) ) // Self Edit?
@ -590,7 +590,7 @@ function amp_insert_link($actions) {
global $ydb; global $ydb;
$keyword = $actions[2]; $keyword = $actions[2];
$user = defined(YOURLS_USER) ? YOURLS_USER : NULL; $user = defined('YOURLS_USER') ? YOURLS_USER : NULL;
$table = YOURLS_DB_TABLE_URL; $table = YOURLS_DB_TABLE_URL;
// Insert $keyword against $username // Insert $keyword against $username