%1$s installed, and %2$s activated', $plugins_count, $count_active ); ?>
- -| - | - | - | - | - |
|---|---|---|---|---|
| %s | %s | %s | %s | %s |
plugin.php.' ); ?>
- - - -Plugin list.' ); ?>
-%1$s to %2$s of %3$s URLs' ), $display_on_page, $max_on_page, $total_items ); - if( $total_items_clicks !== false ) - echo ", " . sprintf( yourls_n( 'counting 1 click', 'counting %s clicks', $total_items_clicks ), yourls_number_format_i18n( $total_items_clicks ) ); - ?>.
+ +%1$s to %2$s of %3$s URLs' ), $display_on_page, $max_on_page, $total_items ); + if( $total_items_clicks !== false ) + echo ", " . sprintf( yourls_n( 'counting 1 click', 'counting %s clicks', $total_items_clicks ), yourls_number_format_i18n( $total_items_clicks ) ); + } + ?>.
%1$s links, %2$s clicks, and counting!' ), yourls_number_format_i18n( $total_urls ), yourls_number_format_i18n( $total_clicks ) ); ?>
$(document).ready(function(){ - feedback( "' . $return['message'] . '", "'. $return['status'] .'"); - init_clipboard(); - });'; + echo ''; } yourls_do_action( 'admin_page_before_table' ); @@ -270,42 +279,42 @@ yourls_table_head(); if ( !$is_bookmark ) { - $params = array( - 'search' => $search, - 'search_text' => $search_text, - 'search_in' => $search_in, - 'sort_by' => $sort_by, - 'sort_order' => $sort_order, - 'page' => $page, - 'perpage' => $perpage, - 'click_filter' => $click_filter, - 'click_limit' => $click_limit, - 'total_pages' => $total_pages, - 'date_filter' => $date_filter, - 'date_first' => $date_first, - 'date_second' => $date_second, - ); - yourls_html_tfooter( $params ); + $params = array( + 'search' => $search, + 'search_text' => $search_text, + 'search_in' => $search_in, + 'sort_by' => $sort_by, + 'sort_order' => $sort_order, + 'page' => $page, + 'perpage' => $perpage, + 'click_filter' => $click_filter, + 'click_limit' => $click_limit, + 'total_pages' => $total_pages, + 'date_filter' => $date_filter, + 'date_first' => $date_first, + 'date_second' => $date_second, + ); + yourls_html_tfooter( $params ); } yourls_table_tbody_start(); // Main Query $where = yourls_apply_filter( 'admin_list_where', $where ); -$url_results = yourls_get_db()->fetchObjects( "SELECT * FROM `$table_url` WHERE 1=1 ${where['sql']} ORDER BY `$sort_by` $sort_order LIMIT $offset, $perpage;", $where['binds'] ); +$url_results = yourls_get_db('read-admin_index')->fetchObjects( "SELECT * FROM `$table_url` WHERE 1=1 {$where['sql']} ORDER BY `$sort_by` $sort_order LIMIT $offset, $perpage;", $where['binds'] ); $found_rows = false; if( $url_results ) { - $found_rows = true; - foreach( $url_results as $url_result ) { - $keyword = yourls_sanitize_keyword($url_result->keyword); - $timestamp = strtotime( $url_result->timestamp ); - $url = stripslashes( $url_result->url ); - $ip = $url_result->ip; - $title = $url_result->title ? $url_result->title : ''; - $clicks = $url_result->clicks; - - echo yourls_table_add_row( $keyword, $url, $title, $ip, $clicks, $timestamp ); - } + $found_rows = true; + foreach( $url_results as $url_result ) { + $keyword = yourls_sanitize_keyword($url_result->keyword); + $timestamp = strtotime( $url_result->timestamp ); + $url = stripslashes( $url_result->url ); + $ip = $url_result->ip; + $title = $url_result->title ? $url_result->title : ''; + $clicks = $url_result->clicks; + + echo yourls_table_add_row( $keyword, $url, $title, $ip, $clicks, $timestamp ); + } } $display = $found_rows ? 'display:none' : ''; @@ -317,8 +326,10 @@ yourls_do_action( 'admin_page_after_table' ); +yourls_delete_link_modal(); + if ( $is_bookmark ) - yourls_share_box( $url, $return['shorturl'], $title, $text ); + yourls_share_box( $url, $return['shorturl'], $title, $text ); ?> diff --git a/admin/install.php b/admin/install.php index bb20ed4b3..3d4b99a1a 100644 --- a/admin/install.php +++ b/admin/install.php @@ -2,7 +2,6 @@ define( 'YOURLS_ADMIN', true ); define( 'YOURLS_INSTALLING', true ); require_once( dirname( __DIR__ ).'/includes/load-yourls.php' ); -require_once( YOURLS_INC.'/functions-install.php' ); $error = array(); $warning = array(); @@ -10,44 +9,44 @@ // Check pre-requisites if ( !yourls_check_PDO() ) { - $error[] = yourls__( 'PHP extension for PDO not found' ); - yourls_debug_log( 'PHP PDO extension not found' ); + $error[] = yourls__( 'PHP extension for PDO not found' ); + yourls_debug_log( 'PHP PDO extension not found' ); } if ( !yourls_check_database_version() ) { - $error[] = yourls_s( '%s version is too old. Ask your server admin for an upgrade.', 'MySQL' ); - yourls_debug_log( 'MySQL version: ' . yourls_get_database_version() ); + $error[] = yourls_s( '%s version is too old. Ask your server admin for an upgrade.', 'MySQL' ); + yourls_debug_log( 'MySQL version: ' . yourls_get_database_version() ); } if ( !yourls_check_php_version() ) { - $error[] = yourls_s( '%s version is too old. Ask your server admin for an upgrade.', 'PHP' ); - yourls_debug_log( 'PHP version: ' . PHP_VERSION ); + $error[] = yourls_s( '%s version is too old. Ask your server admin for an upgrade.', 'PHP' ); + yourls_debug_log( 'PHP version: ' . PHP_VERSION ); } // Is YOURLS already installed ? if ( yourls_is_installed() ) { - $error[] = yourls__( 'YOURLS already installed.' ); - // check if .htaccess exists, recreate otherwise. No error checking. - if( !file_exists( YOURLS_ABSPATH.'/.htaccess' ) ) { - yourls_create_htaccess(); - } + $error[] = yourls__( 'YOURLS already installed.' ); + // check if .htaccess exists, recreate otherwise. No error checking. + if( !file_exists( YOURLS_ABSPATH.'/.htaccess' ) ) { + yourls_create_htaccess(); + } } // Start install if possible and needed if ( isset($_REQUEST['install']) && count( $error ) == 0 ) { - // Create/update .htaccess file - if ( yourls_create_htaccess() ) { - $success[] = yourls__( 'File .htaccess successfully created/updated.' ); - } else { - $warning[] = yourls__( 'Could not write file .htaccess in YOURLS root directory. You will have to do it manually. See how.' ); - } + // Create/update .htaccess file + if ( yourls_create_htaccess() ) { + $success[] = yourls__( 'File .htaccess successfully created/updated.' ); + } else { + $warning[] = yourls__( 'Could not write file .htaccess in YOURLS root directory. You will have to do it manually. See how.' ); + } - // Create SQL tables - $install = yourls_create_sql_tables(); - if ( isset( $install['error'] ) ) - $error = array_merge( $error, $install['error'] ); - if ( isset( $install['success'] ) ) - $success = array_merge( $success, $install['success'] ); + // Create SQL tables + $install = yourls_create_sql_tables(); + if ( isset( $install['error'] ) ) + $error = array_merge( $error, $install['error'] ); + if ( isset( $install['success'] ) ) + $success = array_merge( $success, $install['success'] ); } @@ -55,30 +54,30 @@ yourls_html_head( 'install', yourls__( 'Install YOURLS' ) ); ?>
-
+ // Display install button or link to admin area if applicable
+ if( !yourls_is_installed() && !isset($_REQUEST['install']) ) {
+ echo '';
+ } else {
+ if( count($error) == 0 )
+ echo '';
+ }
+ ?>
+
diff --git a/admin/plugins.php b/admin/plugins.php
index 123f63080..8d02b96dd 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -5,54 +5,56 @@
// Handle plugin administration pages
if( isset( $_GET['page'] ) && !empty( $_GET['page'] ) ) {
- yourls_plugin_admin_page( $_GET['page'] );
+ yourls_plugin_admin_page( $_GET['page'] );
die();
}
// Handle activation/deactivation of plugins
if( isset( $_GET['action'] ) ) {
- // Check nonce
- yourls_verify_nonce( 'manage_plugins', $_REQUEST['nonce'] );
-
- // Check plugin file is valid
- if( isset( $_GET['plugin'] ) && yourls_validate_plugin_file( YOURLS_PLUGINDIR.'/'.$_GET['plugin'].'/plugin.php') ) {
-
- // Activate / Deactive
- switch( $_GET['action'] ) {
- case 'activate':
- $result = yourls_activate_plugin( $_GET['plugin'].'/plugin.php' );
- if( $result === true )
- yourls_redirect( yourls_admin_url( 'plugins.php?success=activated' ), 302 );
-
- break;
-
- case 'deactivate':
- $result = yourls_deactivate_plugin( $_GET['plugin'].'/plugin.php' );
- if( $result === true )
- yourls_redirect( yourls_admin_url( 'plugins.php?success=deactivated' ), 302 );
-
- break;
-
- default:
- $result = yourls__( 'Unsupported action' );
- break;
- }
- } else {
- $result = yourls__( 'No plugin specified, or not a valid plugin' );
- }
-
- yourls_add_notice( $result );
+ // Check nonce
+ yourls_verify_nonce( 'manage_plugins', $_REQUEST['nonce'] ?? '');
+
+ // Check plugin file is valid
+ if(isset( $_GET['plugin'] ) && yourls_is_a_plugin_file(YOURLS_PLUGINDIR . '/' . $_GET['plugin'] . '/plugin.php') ) {
+
+ // Activate / Deactive
+ switch( $_GET['action'] ) {
+ case 'activate':
+ $result = yourls_activate_plugin( $_GET['plugin'].'/plugin.php' );
+ if( $result === true ) {
+ yourls_redirect(yourls_admin_url('plugins.php?success=activated'), 302);
+ exit();
+ }
+ break;
+
+ case 'deactivate':
+ $result = yourls_deactivate_plugin( $_GET['plugin'].'/plugin.php' );
+ if( $result === true ) {
+ yourls_redirect(yourls_admin_url('plugins.php?success=deactivated'), 302);
+ exit();
+ }
+ break;
+
+ default:
+ $result = yourls__( 'Unsupported action' );
+ break;
+ }
+ } else {
+ $result = yourls__( 'No plugin specified, or not a valid plugin' );
+ }
+
+ yourls_add_notice( $result );
}
-// Handle message upon succesfull (de)activation
+// Handle message upon successful (de)activation
if( isset( $_GET['success'] ) && ( ( $_GET['success'] == 'activated' ) OR ( $_GET['success'] == 'deactivated' ) ) ) {
- if( $_GET['success'] == 'activated' ) {
- $message = yourls__( 'Plugin has been activated' );
- } elseif ( $_GET['success'] == 'deactivated' ) {
- $message = yourls__( 'Plugin has been deactivated' );
- }
- yourls_add_notice( $message );
+ if( $_GET['success'] == 'activated' ) {
+ $message = yourls__( 'Plugin has been activated' );
+ } elseif ( $_GET['success'] == 'deactivated' ) {
+ $message = yourls__( 'Plugin has been deactivated' );
+ }
+ yourls_add_notice( $message );
}
yourls_html_head( 'plugins', yourls__( 'Manage Plugins' ) );
@@ -60,106 +62,110 @@
yourls_html_menu();
?>
- %1$s installed, and %2$s activated', $plugins_count, $count_active ); ?>
+ +| + | + | + | + | + |
|---|---|---|---|---|
| %s | %s | %s | %s | %s |
plugin.php.' ); ?>
+ + + +Plugin list.' ); ?>
+bookmarklets for easier link shortening and sharing.' ); ?>
+bookmarklets for easier link shortening and sharing.' ); ?>
- + --
-
- Standard Bookmarklets will take you to a page where you can easily edit or delete your brand new short URL.' ); ?> +
- Standard Bookmarklets will take you to a page where you can easily edit or delete your brand new short URL.' ); ?> -
- Instant Bookmarklets will pop the short URL without leaving the page you are viewing (depending on the page and server configuration, they may silently fail)' ); ?> +
- Instant Bookmarklets will pop the short URL without leaving the page you are viewing (depending on the page and server configuration, they may silently fail)' ); ?> -
- Simple Bookmarklets will generate a short URL with a random or sequential keyword.' ); ?> +
- Simple Bookmarklets will generate a short URL with a random or sequential keyword.' ); ?> -
- Custom Keyword Bookmarklets will prompt you for a custom keyword first.' ); ?> -
- Custom Keyword Bookmarklets will prompt you for a custom keyword first.' ); ?> +
-
+
select text on the page you're viewing before clicking on your bookmarklet link" ); - ?>
+select text on the page you're viewing before clicking on your bookmarklet link" ); + ?>
Important Note: bookmarklets may fail on websites with https, especially the "Instant" bookrmarklets. There is nothing you can do about this.'); ?>
- + - +| - | - | - | ||
|---|---|---|---|---|
| - - |
+
+ | |
+
+ |
+ | |
| + + | - | + | ||
| + | ||||
| - | + | - |
-
++
- +- + -
+ - + -%s\" to the beginning of the current URL (right before its 'http://' part) and hit enter.", preg_replace('@https?://@', '', yourls_get_yourls_site()) . '/' ); ?>
+%s\" to the beginning of the current URL (right before its 'http://' part) and hit enter.", preg_replace('@https?://@', '', yourls_get_yourls_site()) . '/' ); ?>
-.
+.
- + - + -username and password parameters.' ); - echo "\n"; - yourls_e( "If you're worried about sending your credentials into the wild, you can also make API calls without using your login or your password, using a secret signature token." ); - ?>
+username and password parameters.' ); + echo "\n"; + yourls_e( "If you're worried about sending your credentials into the wild, you can also make API calls without using your login or your password, using a secret signature token." ); + ?>
-%s', yourls_auth_signature() ); ?>
+
%s', yourls_auth_signature() ); ?>
-
-
-
-
signature in your API requests. Example:' ); ?>
-
-/yourls-api.php?signature=&action=...
+ -
+
signature in your API requests. Example:' ); ?>
+
+/yourls-api.php?signature=&action=...
- - +
-
-<?php $timestamp = time(); // $time = @@ -322,19 +322,19 @@ // $signature = "" ?>signature and timestamp in your API requests. Example:' ); ?>
-
-/yourls-api.php?timestamp=$timestamp&signature=$signature&action=...
- -
- /yourls-api.php?timestamp=&signature=&action=...
-
-
+
signature and timestamp in your API requests. Example:' ); ?>
+/yourls-api.php?timestamp=$timestamp&signature=$signature&action=...
+ /yourls-api.php?timestamp=&signature=&action=...
Passwordless API page on the wiki.', 'https://yourls.org/passwordlessapi' ); ?> - API documentation for more', yourls_get_yourls_site() . '/readme.html#API' ); ?>
+Passwordless API page on the wiki.', 'https://yourls.org/passwordlessapi' ); ?> + API documentation for more', yourls_get_yourls_site() . '/readme.html#API' ); ?>
-' . yourls_s( 'Upgrade not required. Go back to play!', yourls_admin_url('index.php') ) . '
'; } else { - /* - step 1: create new tables and populate them, update old tables structure, - step 2: convert each row of outdated tables if needed - step 3: - if applicable finish updating outdated tables (indexes etc) - - update version & db_version in options, this is all done! - */ + /* + step 1: create new tables and populate them, update old tables structure, + step 2: convert each row of outdated tables if needed + step 3: - if applicable finish updating outdated tables (indexes etc) + - update version & db_version in options, this is all done! + */ - // From what are we upgrading? - if ( isset( $_GET['oldver'] ) && isset( $_GET['oldsql'] ) ) { - $oldver = yourls_sanitize_version($_GET['oldver']); - $oldsql = (intval)($_GET['oldsql']); - } else { - list( $oldver, $oldsql ) = yourls_get_current_version_from_sql(); - } + // From what are we upgrading? + if ( isset( $_GET['oldver'] ) && isset( $_GET['oldsql'] ) ) { + $oldver = yourls_sanitize_version($_GET['oldver']); + $oldsql = intval($_GET['oldsql']); + } else { + list( $oldver, $oldsql ) = yourls_get_current_version_from_sql(); + } - // To what are we upgrading ? - $newver = YOURLS_VERSION; - $newsql = YOURLS_DB_VERSION; + // To what are we upgrading ? + $newver = YOURLS_VERSION; + $newsql = YOURLS_DB_VERSION; - // Verbose & ugly details - yourls_debug_mode(true); + // Verbose & ugly details + yourls_debug_mode(true); - // Let's go - $step = ( isset( $_GET['step'] ) ? intval( $_GET['step'] ) : 0 ); - switch( $step ) { + // Let's go + $step = ( isset( $_GET['step'] ) ? intval( $_GET['step'] ) : 0 ); + switch( $step ) { - default: - case 0: - ?> - -backup your database
(you should do this regularly anyway)' ); ?>
should happen, but this doesn't mean it won't happen, right? ;)" ); ?>
-something goes wrong, you'll see a message and hopefully a way to fix." ); ?>
-good for you, let it go :)' ); ?>
- - - - - - - - - "; + default: + case 0: + ?> + +backup your database
(you should do this regularly anyway)' ); ?>
should happen, but this doesn't mean it won't happen, right? ;)" ); ?>
+something goes wrong, you'll see a message and hopefully a way to fix." ); ?>
+good for you, let it go :)' ); ?>
+ + + + + + + + + "; - break; + break; - case 1: - case 2: - $upgrade = yourls_upgrade( $step, $oldver, $newver, $oldsql, $newsql ); - break; + case 1: + case 2: + $upgrade = yourls_upgrade( $step, $oldver, $newver, $oldsql, $newsql ); + break; - case 3: - $upgrade = yourls_upgrade( 3, $oldver, $newver, $oldsql, $newsql ); - echo '' . yourls__( 'Your installation is now up to date ! ' ) . '
'; - echo '' . yourls_s( 'Go back to the admin interface', yourls_admin_url('index.php') ) . '
'; - } + case 3: + $upgrade = yourls_upgrade( 3, $oldver, $newver, $oldsql, $newsql ); + echo '' . yourls__( 'Your installation is now up to date ! ' ) . '
'; + echo '' . yourls_s( 'Go back to the admin interface', yourls_admin_url('index.php') ) . '
'; + } } diff --git a/composer.json b/composer.json index 878baf42f..b77e8abb6 100644 --- a/composer.json +++ b/composer.json @@ -16,21 +16,31 @@ "source": "https://github.com/YOURLS/YOURLS" }, "require": { - "php": ">=7.2", + "php": "^8.1", + "ext-dom": "*", + "ext-filter": "*", + "ext-hash": "*", + "ext-pcre": "*", "ext-pdo": "*", - "ozh/bookmarkletgen": "1.2", - "ozh/phpass": "1.3.0", - "rmccue/requests" : "1.8.0", - "pomo/pomo" : "1.4.1", - "geoip2/geoip2" : "2.10.0", - "aura/sql": "~3.", - "jakeasmith/http_build_url": "1.0.1", - "symfony/polyfill-mbstring": "1.15.0", + "ext-pdo_mysql": "*", + "ozh/bookmarkletgen": "^1.2", + "rmccue/requests" : "^2.0", + "pomo/pomo" : "^1.4", + "geoip2/geoip2" : "^2.10", + "aura/sql": "^6.0", + "jakeasmith/http_build_url": "^1.0", + "symfony/polyfill-mbstring": "^1.15", "symfony/polyfill-intl-idn": "^1.17", - "spatie/array-to-xml": "^2.14" + "spatie/array-to-xml": "^3.4" + }, + "require-dev": { + "ext-ctype": "*" }, "config": { - "vendor-dir": "includes/vendor" + "vendor-dir": "includes/vendor", + "platform": { + "php": "8.1.0" + } }, "autoload": { "psr-4": { @@ -38,8 +48,15 @@ } }, "suggest": { + "ext-bcmath": "May be needed to read GeoIP database (or ext-gmp)", + "ext-curl": "Required for API usage", + "ext-gmp": "May be needed to read GeoIP database (or ext-bcmath)", + "ext-iconv": "For safer input handling", + "ext-json": "For faster API performance", "ext-mbstring": "For best performance", - "ext-curl": "Required for API usage" + "ext-openssl": "To fetch titles from HTTPS sites", + "ext-posix": "May be needed on certain PHP versions", + "ext-zlib": "For best performance" }, "scripts": { "post-update-cmd": "bash ./includes/vendor/build-script/yourls-build.sh ./includes/vendor" diff --git a/composer.lock b/composer.lock index 8bd14a671..27941b6f7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,29 +4,30 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "70ceb8b1bf58da7e97bc5988e9b04f97", + "content-hash": "50804e4ad6386df5b147be4320a067e3", "packages": [ { "name": "aura/sql", - "version": "3.0.0", + "version": "6.0.0", "source": { "type": "git", "url": "https://github.com/auraphp/Aura.Sql.git", - "reference": "2be02d5dfd9fdee6df199de1a19572aa490bb744" + "reference": "8e2bb362e8953198df3682c9122e8b9edab5ff20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/auraphp/Aura.Sql/zipball/2be02d5dfd9fdee6df199de1a19572aa490bb744", - "reference": "2be02d5dfd9fdee6df199de1a19572aa490bb744", + "url": "https://api.github.com/repos/auraphp/Aura.Sql/zipball/8e2bb362e8953198df3682c9122e8b9edab5ff20", + "reference": "8e2bb362e8953198df3682c9122e8b9edab5ff20", "shasum": "" }, "require": { - "php": ">=5.6.0", - "psr/log": "^1.0" + "ext-pdo": "*", + "php": "^8.4", + "psr/log": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "pds/skeleton": "~1.0", - "phpunit/phpunit": "~5.0" + "phpunit/phpunit": "^9.5" }, "type": "library", "autoload": { @@ -59,34 +60,34 @@ ], "support": { "issues": "https://github.com/auraphp/Aura.Sql/issues", - "source": "https://github.com/auraphp/Aura.Sql/tree/3.x" + "source": "https://github.com/auraphp/Aura.Sql/tree/6.0.0" }, - "time": "2018-06-11T12:57:42+00:00" + "time": "2025-01-22T06:43:21+00:00" }, { "name": "composer/ca-bundle", - "version": "1.2.9", + "version": "1.5.5", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "78a0e288fdcebf92aa2318a8d3656168da6ac1a5" + "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/78a0e288fdcebf92aa2318a8d3656168da6ac1a5", - "reference": "78a0e288fdcebf92aa2318a8d3656168da6ac1a5", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/08c50d5ec4c6ced7d0271d2862dec8c1033283e6", + "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "psr/log": "^1.0", - "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^8 || ^9", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { @@ -121,7 +122,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.2.9" + "source": "https://github.com/composer/ca-bundle/tree/1.5.5" }, "funding": [ { @@ -137,31 +138,32 @@ "type": "tidelift" } ], - "time": "2021-01-12T12:10:35+00:00" + "time": "2025-01-08T16:17:16+00:00" }, { "name": "geoip2/geoip2", - "version": "v2.10.0", + "version": "v2.13.0", "source": { "type": "git", "url": "https://github.com/maxmind/GeoIP2-php.git", - "reference": "419557cd21d9fe039721a83490701a58c8ce784a" + "reference": "6a41d8fbd6b90052bc34dff3b4252d0f88067b23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/419557cd21d9fe039721a83490701a58c8ce784a", - "reference": "419557cd21d9fe039721a83490701a58c8ce784a", + "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/6a41d8fbd6b90052bc34dff3b4252d0f88067b23", + "reference": "6a41d8fbd6b90052bc34dff3b4252d0f88067b23", "shasum": "" }, "require": { "ext-json": "*", - "maxmind-db/reader": "~1.5", - "maxmind/web-service-common": "~0.6", - "php": ">=5.6" + "maxmind-db/reader": "~1.8", + "maxmind/web-service-common": "~0.8", + "php": ">=7.2" }, "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "5.*", + "friendsofphp/php-cs-fixer": "3.*", + "phpstan/phpstan": "*", + "phpunit/phpunit": "^8.0 || ^9.0", "squizlabs/php_codesniffer": "3.*" }, "type": "library", @@ -192,9 +194,9 @@ ], "support": { "issues": "https://github.com/maxmind/GeoIP2-php/issues", - "source": "https://github.com/maxmind/GeoIP2-php/tree/master" + "source": "https://github.com/maxmind/GeoIP2-php/tree/v2.13.0" }, - "time": "2019-12-12T18:48:39+00:00" + "time": "2022-08-05T20:32:58+00:00" }, { "name": "jakeasmith/http_build_url", @@ -235,28 +237,27 @@ }, { "name": "maxmind-db/reader", - "version": "v1.9.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "9ee9ba9ee287b119e9f5a8e8dbfea0b49647cec4" + "reference": "5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/9ee9ba9ee287b119e9f5a8e8dbfea0b49647cec4", - "reference": "9ee9ba9ee287b119e9f5a8e8dbfea0b49647cec4", + "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90", + "reference": "5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90", "shasum": "" }, "require": { "php": ">=7.2" }, "conflict": { - "ext-maxminddb": "<1.9.0,>=2.0.0" + "ext-maxminddb": "<1.11.1 || >=2.0.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "*", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpcov": ">=6.0.0", + "friendsofphp/php-cs-fixer": "3.*", + "phpstan/phpstan": "*", "phpunit/phpunit": ">=8.0.0,<10.0.0", "squizlabs/php_codesniffer": "3.*" }, @@ -293,32 +294,33 @@ ], "support": { "issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues", - "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.9.0" + "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.12.0" }, - "time": "2021-01-07T21:15:29+00:00" + "time": "2024-11-14T22:43:47+00:00" }, { "name": "maxmind/web-service-common", - "version": "v0.8.1", + "version": "v0.10.0", "source": { "type": "git", "url": "https://github.com/maxmind/web-service-common-php.git", - "reference": "32f274051c543fc865e5a84d3a2c703913641ea8" + "reference": "d7c7c42fc31bff26e0ded73a6e187bcfb193f9c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/32f274051c543fc865e5a84d3a2c703913641ea8", - "reference": "32f274051c543fc865e5a84d3a2c703913641ea8", + "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/d7c7c42fc31bff26e0ded73a6e187bcfb193f9c4", + "reference": "d7c7c42fc31bff26e0ded73a6e187bcfb193f9c4", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0.3", "ext-curl": "*", "ext-json": "*", - "php": ">=7.2" + "php": ">=8.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", + "friendsofphp/php-cs-fixer": "3.*", + "phpstan/phpstan": "*", "phpunit/phpunit": "^8.0 || ^9.0", "squizlabs/php_codesniffer": "3.*" }, @@ -343,26 +345,26 @@ "homepage": "https://github.com/maxmind/web-service-common-php", "support": { "issues": "https://github.com/maxmind/web-service-common-php/issues", - "source": "https://github.com/maxmind/web-service-common-php/tree/v0.8.1" + "source": "https://github.com/maxmind/web-service-common-php/tree/v0.10.0" }, - "time": "2020-11-02T17:00:53+00:00" + "time": "2024-11-14T23:14:52+00:00" }, { "name": "ozh/bookmarkletgen", - "version": "1.2", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/ozh/bookmarkletgen.git", - "reference": "3319b53c493a1474a03d1cc4e087617652284c20" + "reference": "65fffa64bb11f70470d398d7baf6d9bb84411cfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ozh/bookmarkletgen/zipball/3319b53c493a1474a03d1cc4e087617652284c20", - "reference": "3319b53c493a1474a03d1cc4e087617652284c20", + "url": "https://api.github.com/repos/ozh/bookmarkletgen/zipball/65fffa64bb11f70470d398d7baf6d9bb84411cfc", + "reference": "65fffa64bb11f70470d398d7baf6d9bb84411cfc", "shasum": "" }, "require": { - "php": ">=5.3" + "php": ">=7.2" }, "type": "library", "autoload": { @@ -388,81 +390,30 @@ ], "support": { "issues": "https://github.com/ozh/bookmarkletgen/issues", - "source": "https://github.com/ozh/bookmarkletgen/tree/master" - }, - "time": "2017-05-18T12:46:21+00:00" - }, - { - "name": "ozh/phpass", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/ozh/phpass.git", - "reference": "44149d1ee06ccbda397f08f69d32c59802e4ce43" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ozh/phpass/zipball/44149d1ee06ccbda397f08f69d32c59802e4ce43", - "reference": "44149d1ee06ccbda397f08f69d32c59802e4ce43", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": ">=4.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Ozh\\Phpass\\": "src/" - } + "source": "https://github.com/ozh/bookmarkletgen/tree/1.2.2" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Public Domain" - ], - "authors": [ - { - "name": "Solar Designer", - "email": "solar@openwall.com", - "homepage": "http://openwall.com/phpass/" - } - ], - "description": "Portable PHP password hashing framework", - "homepage": "http://github.com/ozh/phpass/", - "keywords": [ - "blowfish", - "crypt", - "password", - "security" - ], - "support": { - "issues": "https://github.com/ozh/phpass/issues", - "source": "https://github.com/ozh/phpass/tree/1.3.0" - }, - "time": "2020-03-29T10:39:31+00:00" + "time": "2022-05-04T13:05:16+00:00" }, { "name": "pomo/pomo", - "version": "v1.4.1", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/LeoColomb/pomo.git", - "reference": "1594bd1f90c89a45ffc3da2ee6d5d582bfac7542" + "reference": "b1e53a997850496369634d574fa6b508091fc353" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LeoColomb/pomo/zipball/1594bd1f90c89a45ffc3da2ee6d5d582bfac7542", - "reference": "1594bd1f90c89a45ffc3da2ee6d5d582bfac7542", + "url": "https://api.github.com/repos/LeoColomb/pomo/zipball/b1e53a997850496369634d574fa6b508091fc353", + "reference": "b1e53a997850496369634d574fa6b508091fc353", "shasum": "" }, "require": { "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": ">=4.0", - "squizlabs/php_codesniffer": "^3.0 || ^2.9.1" + "phpunit/phpunit": "^4.0 || ^7.0", + "squizlabs/php_codesniffer": "^3.0" }, "type": "library", "autoload": { @@ -486,7 +437,7 @@ "role": "Maintainer" } ], - "description": "Gettext library to translate with I18n", + "description": "Gettext library to translate with i18n", "homepage": "https://github.com/LeoColomb/pomo", "keywords": [ "gettext", @@ -497,36 +448,46 @@ ], "support": { "issues": "https://github.com/LeoColomb/pomo/issues", - "source": "https://github.com/LeoColomb/pomo/tree/master" + "source": "https://github.com/LeoColomb/pomo/tree/v1.5.0" }, - "time": "2018-12-20T14:55:38+00:00" + "funding": [ + { + "url": "https://github.com/LeoColomb", + "type": "github" + }, + { + "url": "https://www.patreon.com/LeoColomb", + "type": "patreon" + } + ], + "time": "2023-01-06T01:05:43+00:00" }, { "name": "psr/log", - "version": "1.1.3", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -536,7 +497,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -547,42 +508,56 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2020-03-23T09:12:05+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "rmccue/requests", - "version": "v1.8.0", + "version": "v2.0.15", "source": { "type": "git", "url": "https://github.com/WordPress/Requests.git", - "reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1" + "reference": "877cd66169755899682f1595e057334b40d9d149" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress/Requests/zipball/afbe4790e4def03581c4a0963a1e8aa01f6030f1", - "reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1", + "url": "https://api.github.com/repos/WordPress/Requests/zipball/877cd66169755899682f1595e057334b40d9d149", + "reference": "877cd66169755899682f1595e057334b40d9d149", "shasum": "" }, "require": { - "php": ">=5.2" + "ext-json": "*", + "php": ">=5.6" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7", "php-parallel-lint/php-console-highlighter": "^0.5.0", - "php-parallel-lint/php-parallel-lint": "^1.3", + "php-parallel-lint/php-parallel-lint": "^1.3.1", "phpcompatibility/php-compatibility": "^9.0", - "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5", - "requests/test-server": "dev-master", - "squizlabs/php_codesniffer": "^3.5", - "wp-coding-standards/wpcs": "^2.0" + "requests/test-server": "dev-main", + "roave/security-advisories": "dev-latest", + "squizlabs/php_codesniffer": "^3.6", + "wp-coding-standards/wpcs": "^2.0", + "yoast/phpunit-polyfills": "^1.0.0" + }, + "suggest": { + "art4/requests-psr18-adapter": "For using Requests as a PSR-18 HTTP Client", + "ext-curl": "For improved performance", + "ext-openssl": "For secure transport support", + "ext-zlib": "For improved performance when decompressing encoded streams" }, "type": "library", "autoload": { - "psr-0": { - "Requests": "library/" - } + "files": [ + "library/Deprecated.php" + ], + "psr-4": { + "WpOrg\\Requests\\": "src/" + }, + "classmap": [ + "library/Requests.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -591,11 +566,23 @@ "authors": [ { "name": "Ryan McCue", - "homepage": "http://ryanmccue.info" + "homepage": "https://rmccue.io/" + }, + { + "name": "Alain Schlesser", + "homepage": "https://github.com/schlessera" + }, + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl" + }, + { + "name": "Contributors", + "homepage": "https://github.com/WordPress/Requests/graphs/contributors" } ], "description": "A HTTP library written in PHP, for human beings.", - "homepage": "http://github.com/WordPress/Requests", + "homepage": "https://requests.ryanmccue.info/", "keywords": [ "curl", "fsockopen", @@ -606,35 +593,41 @@ "sockets" ], "support": { + "docs": "https://requests.ryanmccue.info/", "issues": "https://github.com/WordPress/Requests/issues", - "source": "https://github.com/WordPress/Requests/tree/v1.8.0" + "source": "https://github.com/WordPress/Requests" }, - "time": "2021-04-27T11:05:25+00:00" + "time": "2025-01-21T10:13:31+00:00" }, { "name": "spatie/array-to-xml", - "version": "2.15.0", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "1795afad4e5a1f4b7af2e0e09802550eaa00a6f8" + "reference": "88b2f3852a922dd73177a68938f8eb2ec70c7224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/1795afad4e5a1f4b7af2e0e09802550eaa00a6f8", - "reference": "1795afad4e5a1f4b7af2e0e09802550eaa00a6f8", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/88b2f3852a922dd73177a68938f8eb2ec70c7224", + "reference": "88b2f3852a922dd73177a68938f8eb2ec70c7224", "shasum": "" }, "require": { "ext-dom": "*", - "php": "^7.2" + "php": "^8.0" }, "require-dev": { - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^8.0", - "spatie/phpunit-snapshot-assertions": "^2.0" + "mockery/mockery": "^1.2", + "pestphp/pest": "^1.21", + "spatie/pest-plugin-snapshots": "^1.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, "autoload": { "psr-4": { "Spatie\\ArrayToXml\\": "src" @@ -648,7 +641,7 @@ { "name": "Freek Van der Herten", "email": "freek@spatie.be", - "homepage": "https://murze.be", + "homepage": "https://freek.dev", "role": "Developer" } ], @@ -660,50 +653,55 @@ "xml" ], "support": { - "issues": "https://github.com/spatie/array-to-xml/issues", - "source": "https://github.com/spatie/array-to-xml/tree/2.15.0" + "source": "https://github.com/spatie/array-to-xml/tree/3.4.4" }, - "time": "2020-10-29T18:11:03+00:00" + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2025-12-15T09:00:41+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.22.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", - "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.22-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -734,7 +732,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -750,45 +748,42 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "6e971c891537eb617a00bb07a43d182a6915faba" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba", - "reference": "6e971c891537eb617a00bb07a43d182a6915faba", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.22-dev" - }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -818,7 +813,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -834,41 +829,45 @@ "type": "tidelift" } ], - "time": "2021-01-07T17:09:11+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.15.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.2" + }, + "provide": { + "ext-mbstring": "*" }, "suggest": { "ext-mbstring": "For best performance" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.15-dev" + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -894,83 +893,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.15.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-03-09T19:04:49+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.22.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.22-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -986,19 +909,29 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2024-09-09T11:45:10+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.2", - "ext-pdo": "*" + "php": "^8.1", + "ext-dom": "*", + "ext-filter": "*", + "ext-hash": "*", + "ext-pcre": "*", + "ext-pdo": "*", + "ext-pdo_mysql": "*" + }, + "platform-dev": { + "ext-ctype": "*" + }, + "platform-overrides": { + "php": "8.1" }, - "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.6.0" } diff --git a/css/style.css b/css/style.css index d7f50d971..1f108417d 100644 --- a/css/style.css +++ b/css/style.css @@ -18,8 +18,6 @@ body { border-right:3px solid #2a85b3; border-bottom:3px solid #2a85b3; border-top:3px solid #2a85b3; - -moz-border-radius:20px; - -webkit-border-radius:20px; border-radius:20px; } .hide-if-no-js {display: none;} @@ -68,8 +66,6 @@ tt { } input, textarea { - -moz-border-radius:3px; - -webkit-border-radius:3px; border-radius:3px; } Input.text, select, textarea { @@ -129,8 +125,11 @@ tr.edit-row td { td.url small a{ color:#bbc; } -body.desktop td.actions input,body.desktop td.actions a { - visibility:hidden; +/* Hide buttons visually but keep them accessible to screen readers */ +body.desktop td.actions input, body.desktop td.actions a { + opacity: 0; + pointer-events: none; + transition: opacity 0.2s ease; } td.timestamp span.timestamp { display:none; @@ -138,8 +137,20 @@ td.timestamp span.timestamp { td.actions input.disabled, td.actions input.loading { visibility:visible; } +/* Show buttons on row hover */ tr:hover td.actions input, tr:hover td.actions a { - visibility:visible; + opacity: 1; + pointer-events: auto; +} +/* Show buttons when any button in the actions cell receives focus */ +td.actions:focus-within input, td.actions:focus-within a { + opacity: 1; + pointer-events: auto; +} +/* Show all buttons when any element in the row receives focus (for keyboard nav through the entire row) */ +tr:focus-within td.actions input, tr:focus-within td.actions a { + opacity: 1; + pointer-events: auto; } td.actions .button { font-family: Verdana, Arial; @@ -148,8 +159,6 @@ td.actions .button { font-weight: bold; background-color: #FFFFFF; border: 1px solid #88c0eb; - -moz-border-radius:3px; - -webkit-border-radius:3px; border-radius:3px; cursor:pointer; height:22px; @@ -203,7 +212,7 @@ td.actions .button_stats { background:#efe; } #login { - width: 300px; + max-width: 300px; margin: 200px auto 0px auto; } #login p{ @@ -240,8 +249,6 @@ td.actions .button_stats { } a.bookmarklet { border:2px solid #2a85b3; - -moz-border-radius:3px; - -webkit-border-radius:3px; border-radius:3px; padding:5px 5px 5px 20px; background:#eef url(../images/favicon.svg) 2px center no-repeat; @@ -262,14 +269,8 @@ a.bookmarklet:hover { background:white; margin:0 auto; max-width:950px; - -moz-border-radius:10px; - -webkit-border-radius:10px; border-radius:10px; border:2px solid #2a85b3; - -moz-border-radius-bottomleft:30px; - -moz-border-radius-bottomright:30px; - -webkit-border-bottom-left-radius:25px; - -webkit-border-bottom-right-radius:25px; border-bottom-left-radius:25px; border-bottom-right-radius:25px; } @@ -281,8 +282,6 @@ a.bookmarklet:hover { .notice { border:1px solid #2a85b3; background: #F3FAFD; - -moz-border-radius:6px; - -webkit-border-radius:6px; border-radius:6px; width:70%; margin-left:15%; @@ -290,7 +289,6 @@ a.bookmarklet:hover { margin-bottom:5px; } - .jquery-notify-bar { width:100%; position:fixed; @@ -305,11 +303,7 @@ a.bookmarklet:hover { padding:20px 0px; border-bottom:1px solid #bbb; filter:alpha(opacity=95); - -moz-opacity:0.95; - -khtml-opacity:0.95; opacity:0.95; - -moz-box-shadow: 0 1px 5px rgba(0,0,0,0.5); - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); text-shadow: 0 1px 1px rgba(0,0,0,0.1); } .jquery-notify-bar.error ,.jquery-notify-bar.fail { @@ -335,3 +329,59 @@ a.bookmarklet:hover { tr.plugin.active a{ font-weight:bolder;} body.desktop tr.plugin td.plugin_desc small{ visibility:hidden;} tr:hover.plugin td.plugin_desc small{ visibility:visible;} + +#delete-confirm-dialog { + background-color: #ffffff; + width: 50em; + height: 19em; + padding: 0px; + border: 3px solid #2a85b3; + border-radius: 20px; +} +#delete-confirm-dialog > div[name="dialog_title"] { + background-color: #c7e7ff; + font-size: 20px; + color: #026090; + text-align: center; + padding-top: 0.5em; + padding-bottom: 0.5em; + border-start-start-radius: 17px 17px; + border-start-end-radius: 17px 17px; +} +#delete-confirm-dialog div.confirm-message { + background-color: #ffffff; + width: calc(50em - 4em); + height: calc(20em - 50px - 5em - 2em + 6px); + float: none; + text-align: left; + padding: 1em 2em; + overflow: hidden; +} +#delete-confirm-dialog div.confirm-message ul { + border-left: 5px solid #026090; + list-style-type: none; + padding: 0 1em; +} +#delete-confirm-dialog div.confirm-message ul li { + margin-bottom: 0.5em; +} +#delete-confirm-dialog div.confirm-message ul li span { + border: 1px solid #c7e7ff; + border-radius: 3px; + padding: 1px 5px; + color:#333; +} +#delete-confirm-dialog div.button-group { + background-color: #e3f3ff; + width: calc(50em - 4em); + height: 2em; + float: none; + text-align: right; + padding: 1em 2em; + border-end-start-radius: 17px 17px; + border-end-end-radius: 17px 17px; +} +#delete-confirm-dialog::backdrop { + background-color: #666; + opacity: 80%; +} diff --git a/includes/Config/Config.php b/includes/Config/Config.php index 5958d70fe..cef031b26 100644 --- a/includes/Config/Config.php +++ b/includes/Config/Config.php @@ -11,20 +11,20 @@ class Config { /** - * @param string + * @var string */ protected $root; /** - * @param mixed + * @var string */ protected $config; /** * @since 1.7.3 - * @param mixed $config Optional user defined config path + * @param string $config Optional user defined config path */ - public function __construct($config = false) { + public function __construct($config = '') { $this->set_root( $this->fix_win32_path( dirname( dirname( __DIR__ ) ) ) ); $this->set_config($config); } @@ -42,7 +42,7 @@ public function fix_win32_path($path) { /** * @since 1.7.3 - * @param string path to config file + * @param string $config path to config file * @return void */ public function set_config($config) { @@ -51,7 +51,7 @@ public function set_config($config) { /** * @since 1.7.3 - * @param string path to YOURLS root directory + * @param string $root path to YOURLS root directory * @return void */ public function set_root($root) { diff --git a/includes/Config/Init.php b/includes/Config/Init.php index dce118d01..d97d9ae2f 100644 --- a/includes/Config/Init.php +++ b/includes/Config/Init.php @@ -9,7 +9,7 @@ class Init { /** - * @param InitDefaults + * @var InitDefaults */ protected $actions; @@ -32,11 +32,6 @@ public function __construct(InitDefaults $actions) { date_default_timezone_set( 'UTC' ); } - // Load locale - if ($actions->load_default_textdomain === true) { - yourls_load_default_textdomain(); - } - // Check if we are in maintenance mode - if yes, it will die here. if ($actions->check_maintenance_mode === true) { yourls_check_maintenance_mode(); @@ -57,7 +52,7 @@ public function __construct(InitDefaults $actions) { $this->include_db_files(); } - // Allow early inclusion of a cache layer + // Allow early and unconditional inclusion of custom code if ($actions->include_cache === true) { $this->include_cache_files(); } @@ -87,6 +82,7 @@ public function __construct(InitDefaults $actions) { if (!yourls_is_installed() && !yourls_is_installing()) { yourls_no_cache_headers(); yourls_redirect( yourls_admin_url('install.php'), 307 ); + exit(); } } @@ -95,6 +91,7 @@ public function __construct(InitDefaults $actions) { if (!yourls_is_upgrading() && !yourls_is_installing() && yourls_upgrade_is_needed()) { yourls_no_cache_headers(); yourls_redirect( yourls_admin_url('upgrade.php'), 307 ); + exit(); } } @@ -108,6 +105,11 @@ public function __construct(InitDefaults $actions) { yourls_do_action( 'plugins_loaded' ); } + // Load locale + if ($actions->load_default_textdomain === true) { + yourls_load_default_textdomain(); + } + // Is there a new version of YOURLS ? if ($actions->check_new_version === true) { if (yourls_is_installed() && !yourls_is_upgrading()) { @@ -143,22 +145,41 @@ public function redirect_ssl_if_needed() { * @return void */ public function include_db_files() { - // Allow drop-in replacement for the DB engine - if (file_exists(YOURLS_USERDIR.'/db.php')) { - require_once YOURLS_USERDIR.'/db.php'; - } else { - require_once YOURLS_INC.'/class-mysql.php'; + // Attempt to open drop-in replacement for the DB engine else default to core engine + $file = YOURLS_USERDIR . '/db.php'; + $attempt = false; + if(file_exists($file)) { + $attempt = yourls_include_file_sandbox( $file ); + // Check if we have an error to display + if ( is_string( $attempt ) ) { + yourls_add_notice( $attempt ); + } + } + + // Fallback to core DB engine + if ( $attempt !== true ) { + require_once YOURLS_INC . '/class-mysql.php'; yourls_db_connect(); } } /** + * Include custom extension file. + * + * "Cache" stands for "Custom Additional Code for Hazardous Extensions". + * * @since 1.7.3 * @return void */ public function include_cache_files() { - if (file_exists(YOURLS_USERDIR.'/cache.php')) { - require_once YOURLS_USERDIR.'/cache.php'; + $file = YOURLS_USERDIR . '/cache.php'; + $attempt = false; + if(file_exists($file)) { + $attempt = yourls_include_file_sandbox($file); + // Check if we have an error to display + if (is_string($attempt)) { + yourls_add_notice($attempt); + } } } @@ -185,12 +206,8 @@ public function include_core_functions() { require_once YOURLS_INC.'/functions-infos.php'; require_once YOURLS_INC.'/functions-deprecated.php'; require_once YOURLS_INC.'/functions-auth.php'; - - // Load install & upgrade functions if needed - if ($this->actions->include_install_upgrade_funcs === true) { - require_once YOURLS_INC.'/functions-upgrade.php'; - require_once YOURLS_INC.'/functions-install.php'; - } + require_once YOURLS_INC.'/functions-upgrade.php'; + require_once YOURLS_INC.'/functions-install.php'; } } diff --git a/includes/Config/InitDefaults.php b/includes/Config/InitDefaults.php index 7792e0113..791650c9d 100644 --- a/includes/Config/InitDefaults.php +++ b/includes/Config/InitDefaults.php @@ -20,12 +20,6 @@ class InitDefaults { */ public $include_core_funcs = true; - /** - * Whether to include auth function files - * @var bool - */ - public $include_install_upgrade_funcs = false; // by default do not load - /** * Whether to set default time zone * @var bool diff --git a/includes/Database/Logger.php b/includes/Database/Logger.php index 6f171b575..3c256dbda 100644 --- a/includes/Database/Logger.php +++ b/includes/Database/Logger.php @@ -47,9 +47,9 @@ class Logger extends AbstractLogger { * ) * See finish() in Aura\Sql\Profiler\Profiler * - * @return null + * @return void */ - public function log($level, $message, array $context = []) { + public function log($level, string|\Stringable $message, array $context = []): void { // if it's an internal SQL query, format the message, otherwise store a string if($level === 'query') { $this->messages[] = sprintf( diff --git a/includes/Database/Options.php b/includes/Database/Options.php index 2eebb641b..f175f08be 100644 --- a/includes/Database/Options.php +++ b/includes/Database/Options.php @@ -75,7 +75,7 @@ public function get_all_options() { $this->ydb->set_option($name, yourls_maybe_unserialize($value)); } - yourls_apply_filter('get_all_options', 'deprecated'); + yourls_do_action('get_all_options', $options); return true; } @@ -172,7 +172,7 @@ public function update($name, $newvalue) { // Cache option value to save a DB query if needed later $this->ydb->set_option($name, $newvalue); - yourls_do_action( 'update_option', $name, $oldvalue, $newvalue ); + yourls_do_action( 'update_option', $name, $oldvalue, $newvalue ); return true; } diff --git a/includes/Database/Profiler.php b/includes/Database/Profiler.php index 2b700b987..ea9e4d222 100644 --- a/includes/Database/Profiler.php +++ b/includes/Database/Profiler.php @@ -21,9 +21,9 @@ class Profiler extends \Aura\Sql\Profiler\Profiler { * * @param string $statement The statement being profiled, if any. * @param array $values The values bound to the statement, if any. - * @return null + * @return void */ - public function finish($statement = null, array $values = []) + public function finish(?string $statement = null, array $values = []): void { if (! $this->active) { return; diff --git a/includes/Database/YDB.php b/includes/Database/YDB.php index 30dac4355..803f34571 100644 --- a/includes/Database/YDB.php +++ b/includes/Database/YDB.php @@ -1,12 +1,12 @@ option, or $ydb->set_option(), use yourls_*_options() functions instead). + * function wrappers (e.g. don't use $ydb->option, or $ydb->set_option(), use yourls_*_options() functions instead). * * @since 1.7.3 */ @@ -33,7 +33,7 @@ class YDB extends ExtendedPdo { protected $context = ''; /** - * Information related to a short URL keyword (eg timestamp, long URL, ...) + * Information related to a short URL keyword (e.g. timestamp, long URL, ...) * * @var array * @@ -53,13 +53,13 @@ class YDB extends ExtendedPdo { protected $option = []; /** - * Plugin admin pages informations + * Plugin admin pages information * @var array */ protected $plugin_pages = []; /** - * Plugin informations + * Plugin information * @var array */ protected $plugins = []; @@ -78,15 +78,15 @@ class YDB extends ExtendedPdo { * @param array $options Driver-specific options * @param array $attributes Attributes to set after a connection */ - public function __construct($dsn, $user, $pass, $options, $attributes) { - parent::__construct($dsn, $user, $pass, $options, $attributes); + public function __construct($dsn, $user, $pass, $options) { + parent::__construct($dsn, $user, $pass, $options); } /** * Init everything needed * * Everything we need to set up is done here in init(), not in the constructor, so even - * when the connection fails (eg config error or DB dead), the constructor has worked + * when the connection fails (e.g. config error or DB dead), the constructor has worked, * and we have a $ydb object properly instantiated (and for instance yourls_die() can * correctly die, even if using $ydb methods) * @@ -140,7 +140,8 @@ public function get_emulate_state() { */ public function connect_to_DB() { try { - $this->connect(); + list($dsn, $_user, $_pwd, $_opt, $_queries) = $this->args; + $this->connect($dsn); } catch ( \Exception $e ) { $this->dead_or_error($e); } @@ -157,16 +158,18 @@ public function connect_to_DB() { */ public function dead_or_error(\Exception $exception) { // Use any /user/db_error.php file - if( file_exists( YOURLS_USERDIR . '/db_error.php' ) ) { - include_once( YOURLS_USERDIR . '/db_error.php' ); - die(); + $file = YOURLS_USERDIR . '/db_error.php'; + if(file_exists($file)) { + if(yourls_include_file_sandbox( $file ) === true) { + die(); + } } $message = yourls__( 'Incorrect DB config, or could not connect to DB' ); $message .= '' . get_class($exception) .': ' . $exception->getMessage(); - yourls_die( yourls__( $message ), yourls__( 'Fatal error' ), 503 ); die(); + } /** @@ -192,6 +195,7 @@ public function start_profiler() { /** * @param string $context + * @return void */ public function set_html_context($context) { $this->context = $context; @@ -209,6 +213,7 @@ public function get_html_context() { /** * @param string $name * @param mixed $value + * @return void */ public function set_option($name, $value) { $this->option[$name] = $value; @@ -232,6 +237,7 @@ public function get_option($name) { /** * @param string $name + * @return void */ public function delete_option($name) { unset($this->option[$name]); @@ -243,6 +249,7 @@ public function delete_option($name) { /** * @param string $keyword * @param mixed $infos + * @return void */ public function set_infos($keyword, $infos) { $this->infos[$keyword] = $infos; @@ -266,9 +273,23 @@ public function get_infos($keyword) { /** * @param string $keyword + * @return void */ public function delete_infos($keyword) { - unset($this->infos[$keyword]); + if (isset($this->infos[$keyword])) { + unset($this->infos[$keyword]); + } + } + + /** + * @param string $keyword + * @param mixed $infos + * @return void + */ + public function update_infos_if_exists($keyword, $infos) { + if ($this->has_infos($keyword) && $this->infos[$keyword]) { + $this->infos[$keyword] = array_merge($this->infos[$keyword], $infos); + } } /** @@ -287,6 +308,7 @@ public function get_plugins() { /** * @param array $plugins + * @return void */ public function set_plugins(array $plugins) { $this->plugins = $plugins; @@ -294,6 +316,7 @@ public function set_plugins(array $plugins) { /** * @param string $plugin plugin filename + * @return void */ public function add_plugin($plugin) { $this->plugins[] = $plugin; @@ -301,6 +324,7 @@ public function add_plugin($plugin) { /** * @param string $plugin plugin filename + * @return void */ public function remove_plugin($plugin) { unset($this->plugins[$plugin]); @@ -318,6 +342,7 @@ public function get_plugin_pages() { /** * @param array $pages + * @return void */ public function set_plugin_pages(array $pages) { $this->plugin_pages = $pages; @@ -327,6 +352,7 @@ public function set_plugin_pages(array $pages) { * @param string $slug * @param string $title * @param callable $function + * @return void */ public function add_plugin_page( $slug, $title, $function ) { $this->plugin_pages[ $slug ] = [ @@ -338,6 +364,7 @@ public function add_plugin_page( $slug, $title, $function ) { /** * @param string $slug + * @return void */ public function remove_plugin_page( $slug ) { unset( $this->plugin_pages[ $slug ] ); @@ -391,77 +418,13 @@ public function is_installed() { } /** - * Return standardized DB version - * - * The regex removes everything that's not a number at the start of the string, or remove anything that's not a number and what - * follows after that. - * 'omgmysql-5.5-ubuntu-4.20' => '5.5' - * 'mysql5.5-ubuntu-4.20' => '5.5' - * '5.5-ubuntu-4.20' => '5.5' - * '5.5-beta2' => '5.5' - * '5.5' => '5.5' + * Return MySQL version * * @since 1.7.3 * @return string */ public function mysql_version() { - $version = $this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION); - return $version; + return $this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION); } - /** - * Deprecated properties since 1.7.3, unused in 3rd party plugins as far as I know - * - * $ydb->DB_driver - * $ydb->captured_errors - * $ydb->dbh - * $ydb->result - * $ydb->rows_affected - * $ydb->show_errors - */ - - /** - * Deprecated functions since 1.7.3 - */ - - // @codeCoverageIgnoreStart - - public function escape($string) { - yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' ); - // This will escape using PDO->quote(), but then remove the enclosing quotes - return substr($this->quote($string), 1, -1); - } - - public function get_col($query) { - yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' ); - yourls_debug_log('LEGACY SQL: '.$query); - return $this->fetchCol($query); - } - - public function get_results($query) { - yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' ); - yourls_debug_log('LEGACY SQL: '.$query); - $stm = parent::query($query); - return($stm->fetchAll(PDO::FETCH_OBJ)); - } - - public function get_row($query) { - yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' ); - yourls_debug_log('LEGACY SQL: '.$query); - $row = $this->fetchObjects($query); - return isset($row[0]) ? $row[0] : null; - } - - public function get_var($query) { - yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' ); - yourls_debug_log('LEGACY SQL: '.$query); - return $this->fetchValue($query); - } - - public function query($query, ...$unused) { - yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' ); - yourls_debug_log('LEGACY SQL: '.$query); - return $this->fetchAffected($query); - } - // @codeCoverageIgnoreEnd } diff --git a/includes/Views/AdminParams.php b/includes/Views/AdminParams.php index 4ceb0b854..892684da6 100644 --- a/includes/Views/AdminParams.php +++ b/includes/Views/AdminParams.php @@ -51,9 +51,12 @@ class AdminParams */ public function __construct() { - $this->possible_search_params = ['all', 'keyword', 'url', 'title', 'ip']; - $this->possible_sort_params = ['keyword', 'url', 'title', 'ip', 'timestamp', 'clicks']; - $this->params_translations = [ + // Cast return values of yourls_apply_filter() to array in case a hook would incorrectly return something else + $this->possible_search_params = (array)yourls_apply_filter('admin_params_possible_search', + ['all', 'keyword', 'url', 'title', 'ip']); + $this->possible_sort_params = (array)yourls_apply_filter('admin_params_possible_sort', + ['keyword', 'url', 'title', 'ip', 'timestamp', 'clicks']); + $this->params_translations = (array)yourls_apply_filter('admin_params_possible_translations',[ 'all' => yourls__('All fields'), 'keyword' => yourls__('Short URL'), 'url' => yourls__('URL'), @@ -61,8 +64,9 @@ public function __construct() 'ip' => yourls__('IP Address'), 'timestamp' => yourls__('Date'), 'clicks' => yourls__('Clicks'), - ]; - $this->possible_date_sorting = ['before', 'after', 'between']; + ]); + $this->possible_date_sorting = (array)yourls_apply_filter('admin_params_possible_date_sort', + ['before', 'after', 'between']); } /** @@ -152,7 +156,7 @@ public function get_search_in(): string * * @since 1.8.2 * - * @return mixed + * @return string */ public function get_sort_by(): string { @@ -218,8 +222,15 @@ public function get_click_filter() public function get_click_limit() { // @hook Default link click threshold (unset) - return (isset($_GET['click_limit']) && intval($_GET['click_limit'])) ? - intval($_GET['click_limit']) : yourls_apply_filter('admin_view_click_limit', ''); + if ( + isset($_GET['click_limit']) // Exists in the query string + && ($_GET['click_limit'] !== '') // Not empty (&stuff=&click_limit=&otherstuff=) + && intval($_GET['click_limit']) >= 0 // A number >= 0 + ) { + return intval($_GET['click_limit']); + } else { + return yourls_apply_filter('admin_view_click_limit', ''); + } } diff --git a/includes/auth.php b/includes/auth.php index d6b95a89d..be98a87da 100644 --- a/includes/auth.php +++ b/includes/auth.php @@ -6,23 +6,23 @@ if( $auth !== true ) { - // API mode, - if ( yourls_is_API() ) { - $format = ( isset($_REQUEST['format']) ? $_REQUEST['format'] : 'xml' ); - $callback = ( isset($_REQUEST['callback']) ? $_REQUEST['callback'] : '' ); - yourls_api_output( $format, array( - 'simple' => $auth, - 'message' => $auth, - 'errorCode' => 403, - 'callback' => $callback, - ) ); - - // Regular mode - } else { - yourls_login_screen( $auth ); - } - - die(); + // API mode, + if ( yourls_is_API() ) { + $format = ( isset($_REQUEST['format']) ? $_REQUEST['format'] : 'xml' ); + $callback = ( isset($_REQUEST['callback']) ? $_REQUEST['callback'] : '' ); + yourls_api_output( $format, array( + 'simple' => $auth, + 'message' => $auth, + 'errorCode' => '403', + 'callback' => $callback, + ) ); + + // Regular mode + } else { + yourls_login_screen( $auth ); + } + + die(); } yourls_do_action( 'auth_successful' ); @@ -36,15 +36,15 @@ // Did we just fail at encrypting passwords ? if ( isset( $_GET['dismiss'] ) && $_GET['dismiss'] == 'hasherror' ) { - yourls_update_option( 'defer_hashing_error', time() + 86400 * 7 ); // now + 1 week + yourls_update_option( 'defer_hashing_error', time() + 86400 * 7 ); // now + 1 week } else { - // Encrypt passwords that are clear text - if ( yourls_maybe_hash_passwords() ) { + // Encrypt passwords that are clear text + if ( yourls_maybe_hash_passwords() ) { $hash = yourls_hash_passwords_now( YOURLS_CONFIGFILE ); if ( $hash === true ) { - // Hashing succesful. Remove flag from DB if any. + // Hashing successful. Remove flag from DB if any. if( yourls_get_option( 'defer_hashing_error' ) ) yourls_delete_option( 'defer_hashing_error' ); } else { @@ -59,5 +59,5 @@ yourls_add_notice( $message ); } } - } + } } diff --git a/includes/class-mysql.php b/includes/class-mysql.php index d2ca2958e..603c87c83 100644 --- a/includes/class-mysql.php +++ b/includes/class-mysql.php @@ -4,8 +4,10 @@ * Connect to DB * * @since 1.0 + * @param string $context Optional context. Default: ''. + * @return \YOURLS\Database\YDB */ -function yourls_db_connect() { +function yourls_db_connect($context = '') { global $ydb; if ( !defined( 'YOURLS_DB_USER' ) @@ -25,12 +27,12 @@ function yourls_db_connect() { yourls_do_action( 'set_DB_driver', 'deprecated' ); // Get custom port if any - if ( false !== strpos( $dbhost, ':' ) ) { + if (str_contains($dbhost, ':')) { list( $dbhost, $dbport ) = explode( ':', $dbhost ); $dbhost = sprintf( '%1$s;port=%2$d', $dbhost, $dbport ); } - $charset = yourls_apply_filter( 'db_connect_charset', 'utf8mb4' ); + $charset = yourls_apply_filter( 'db_connect_charset', 'utf8mb4', $context ); /** * Data Source Name (dsn) used to connect the DB @@ -41,7 +43,7 @@ function yourls_db_connect() { * 'pgsql:host=192.168.13.37;port=5432;dbname=omgwtf' */ $dsn = sprintf( 'mysql:host=%s;dbname=%s;charset=%s', $dbhost, $dbname, $charset ); - $dsn = yourls_apply_filter( 'db_connect_custom_dsn', $dsn ); + $dsn = yourls_apply_filter( 'db_connect_custom_dsn', $dsn, $context ); /** * PDO driver options and attributes @@ -51,14 +53,18 @@ function yourls_db_connect() { * The driver options are passed to the PDO constructor, eg array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION) * The attribute options are then set in a foreach($attr as $k=>$v){$db->setAttribute($k, $v)} loop */ - $driver_options = yourls_apply_filter( 'db_connect_driver_option', [] ); // driver options as key-value pairs - $attributes = yourls_apply_filter( 'db_connect_attributes', [] ); // attributes as key-value pairs + $driver_options = yourls_apply_filter( 'db_connect_driver_option', [], $context ); // driver options as key-value pairs + $attributes = yourls_apply_filter( 'db_connect_attributes', [], $context ); // attributes as key-value pairs $ydb = new \YOURLS\Database\YDB( $dsn, $user, $pass, $driver_options, $attributes ); $ydb->init(); // Past this point, we're connected - yourls_debug_log( sprintf( 'Connected to database %s on %s ', $dbname, $dbhost ) ); + $msg = 'Connected to ' . $dsn; + if ($context !== '') { + $msg .= ', context: ' . $context; + } + yourls_debug_log( $msg ); yourls_debug_mode( YOURLS_DEBUG ); @@ -66,7 +72,7 @@ function yourls_db_connect() { } /** - * Helper function : return instance of the DB + * Helper function: return instance of the DB * * Instead of: * global $ydb; @@ -75,18 +81,46 @@ function yourls_db_connect() { * yourls_get_db()->do_stuff() * * @since 1.7.10 + * @param string $context Optional context. Default: ''. + * If not provided, the function will trigger a notice to encourage developers to provide a context while not + * breaking existing code. A context is a string describing the operation for which the DB is requested. + * Use a naming schema starting with a prefix describing the operation, followed by a short description: + * - Prefix should be either "read-" or "write-", as follows: + * * "read-" for operations that only read from the DB (eg get_keyword_infos) + * * "write-" for operations that write to the DB (eg insert_link_in_db) + * - The description should be lowercase, words separated with underscores, eg "insert_link_in_db". + * Examples: + * - read-fetch_keyword + * - write-insert_link_in_db * @return \YOURLS\Database\YDB */ -function yourls_get_db() { +function yourls_get_db($context = '') { // Allow plugins to short-circuit the whole function - $pre = yourls_apply_filter( 'shunt_get_db', false ); + $pre = yourls_apply_filter( 'shunt_get_db', false, $context ); if ( false !== $pre ) { return $pre; } + // Validate context and raise notice if missing or malformed + if ($context == '' || !preg_match('/^(read|write)-[a-z0-9_]+$/', $context)) { + $db = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2); + $file = $db[0]['file']; + $line = $db[0]['line']; + + if ($context == '') { + $msg = 'Undefined yourls_get_db() context'; + } else { + $msg = 'Improperly formatted yourls_get_db() context ("' . $context . '")'; + } + + trigger_error( $msg . ' at ' . $file . ':' . $line .'', E_USER_NOTICE ); + } + + yourls_do_action( 'get_db_action', $context ); + global $ydb; - $ydb = ( isset( $ydb ) ) ? $ydb : yourls_db_connect(); - return yourls_apply_filter('get_db', $ydb); + $ydb = ( isset( $ydb ) ) ? $ydb : yourls_db_connect($context); + return yourls_apply_filter('get_db', $ydb, $context); } /** @@ -101,6 +135,7 @@ function yourls_get_db() { * * @since 1.7.10 * @param mixed $db Either a \YOURLS\Database\YDB instance, or anything. If null, the function will unset $ydb + * @return void */ function yourls_set_db($db) { global $ydb; diff --git a/includes/functions-api.php b/includes/functions-api.php index baf3cb10e..bd9723758 100644 --- a/includes/functions-api.php +++ b/includes/functions-api.php @@ -15,13 +15,13 @@ * @return array Result of API call */ function yourls_api_action_shorturl() { - $url = ( isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : '' ); - $keyword = ( isset( $_REQUEST['keyword'] ) ? $_REQUEST['keyword'] : '' ); - $title = ( isset( $_REQUEST['title'] ) ? $_REQUEST['title'] : '' ); - $return = yourls_add_new_link( $url, $keyword, $title ); - $return['simple'] = ( isset( $return['shorturl'] ) ? $return['shorturl'] : '' ); // This one will be used in case output mode is 'simple' - unset( $return['html'] ); // in API mode, no need for our internal HTML output - return yourls_apply_filter( 'api_result_shorturl', $return ); + $url = ( isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : '' ); + $keyword = ( isset( $_REQUEST['keyword'] ) ? $_REQUEST['keyword'] : '' ); + $title = ( isset( $_REQUEST['title'] ) ? $_REQUEST['title'] : '' ); + $return = yourls_add_new_link( $url, $keyword, $title ); + $return['simple'] = ( isset( $return['shorturl'] ) ? $return['shorturl'] : '' ); // This one will be used in case output mode is 'simple' + unset( $return['html'] ); // in API mode, no need for our internal HTML output + return yourls_apply_filter( 'api_result_shorturl', $return ); } /** @@ -31,10 +31,10 @@ function yourls_api_action_shorturl() { * @return array Result of API call */ function yourls_api_action_stats() { - $filter = ( isset( $_REQUEST['filter'] ) ? $_REQUEST['filter'] : '' ); - $limit = ( isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : '' ); - $start = ( isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : '' ); - return yourls_apply_filter( 'api_result_stats', yourls_api_stats( $filter, $limit, $start ) ); + $filter = ( isset( $_REQUEST['filter'] ) ? $_REQUEST['filter'] : '' ); + $limit = ( isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : '' ); + $start = ( isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : '' ); + return yourls_apply_filter( 'api_result_stats', yourls_api_stats( $filter, $limit, $start ) ); } /** @@ -44,7 +44,7 @@ function yourls_api_action_stats() { * @return array Result of API call */ function yourls_api_action_db_stats() { - return yourls_apply_filter( 'api_result_db_stats', yourls_api_db_stats() ); + return yourls_apply_filter( 'api_result_db_stats', yourls_api_db_stats() ); } /** @@ -54,8 +54,8 @@ function yourls_api_action_db_stats() { * @return array Result of API call */ function yourls_api_action_url_stats() { - $shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' ); - return yourls_apply_filter( 'api_result_url_stats', yourls_api_url_stats( $shorturl ) ); + $shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' ); + return yourls_apply_filter( 'api_result_url_stats', yourls_api_url_stats( $shorturl ) ); } /** @@ -65,8 +65,8 @@ function yourls_api_action_url_stats() { * @return array Result of API call */ function yourls_api_action_expand() { - $shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' ); - return yourls_apply_filter( 'api_result_expand', yourls_api_expand( $shorturl ) ); + $shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' ); + return yourls_apply_filter( 'api_result_expand', yourls_api_expand( $shorturl ) ); } /** @@ -76,10 +76,10 @@ function yourls_api_action_expand() { * @return array Result of API call */ function yourls_api_action_version() { - $return['version'] = $return['simple'] = YOURLS_VERSION; - if( isset( $_REQUEST['db'] ) && $_REQUEST['db'] == 1 ) - $return['db_version'] = YOURLS_DB_VERSION; - return yourls_apply_filter( 'api_result_version', $return ); + $return['version'] = $return['simple'] = YOURLS_VERSION; + if( isset( $_REQUEST['db'] ) && $_REQUEST['db'] == 1 ) + $return['db_version'] = YOURLS_DB_VERSION; + return yourls_apply_filter( 'api_result_version', $return ); } /** @@ -99,12 +99,12 @@ function yourls_api_action_version() { * @return string API output, as an XML / JSON / JSONP / raw text string */ function yourls_api_output( $mode, $output, $send_headers = true, $echo = true ) { - if( isset( $output['simple'] ) ) { - $simple = $output['simple']; - unset( $output['simple'] ); - } + if( isset( $output['simple'] ) ) { + $simple = $output['simple']; + unset( $output['simple'] ); + } - yourls_do_action( 'pre_api_output', $mode, $output, $send_headers, $echo ); + yourls_do_action( 'pre_api_output', $mode, $output, $send_headers, $echo ); if( $send_headers ) { if( isset( $output['statusCode'] ) ) { @@ -119,43 +119,49 @@ function yourls_api_output( $mode, $output, $send_headers = true, $echo = true ) $result = ''; - switch ( $mode ) { - case 'jsonp': + switch ( $mode ) { + case 'jsonp': if( $send_headers ) yourls_content_type_header( 'application/javascript' ); - $callback = isset( $output['callback'] ) ? $output['callback'] : ''; - $result = $callback . '(' . json_encode( $output ) . ')'; - break; + $callback = isset( $output['callback'] ) ? yourls_validate_jsonp_callback($output['callback'] ) : ''; + if( $callback === false ) { + yourls_status_header( 400 ); + $result = json_encode( ['errorCode' => '400', 'error' => 'Invalid callback parameter'] ); + } else { + $result = $callback . '(' . json_encode( $output ) . ')'; + } + + break; - case 'json': + case 'json': if( $send_headers ) yourls_content_type_header( 'application/json' ); - $result = json_encode( $output ); - break; + $result = json_encode( $output ); + break; - case 'xml': + case 'xml': if( $send_headers ) yourls_content_type_header( 'application/xml' ); - $result = yourls_xml_encode( $output ); - break; + $result = yourls_xml_encode( $output ); + break; - case 'simple': - default: + case 'simple': + default: if( $send_headers ) yourls_content_type_header( 'text/plain' ); - $result = isset( $simple ) ? $simple : ''; - break; - } + $result = isset( $simple ) ? $simple : ''; + break; + } if( $echo ) { echo $result; } - yourls_do_action( 'api_output', $mode, $output, $send_headers, $echo ); + yourls_do_action( 'api_output', $mode, $output, $send_headers, $echo ); return $result; } @@ -163,70 +169,79 @@ function yourls_api_output( $mode, $output, $send_headers = true, $echo = true ) /** * Return array for API stat requests * + * @param string $filter either "top", "bottom" , "rand" or "last" + * @param int $limit maximum number of links to return + * @param int $start offset + * @return array */ -function yourls_api_stats( $filter = 'top', $limit = 10, $start = 0 ) { - $return = yourls_get_stats( $filter, $limit, $start ); - $return['simple'] = 'Need either XML or JSON format for stats'; - $return['message'] = 'success'; - return yourls_apply_filter( 'api_stats', $return, $filter, $limit, $start ); +function yourls_api_stats($filter = 'top', $limit = 10, $start = 0 ) { + $return = yourls_get_stats( $filter, $limit, $start ); + $return['simple'] = 'Need either XML or JSON format for stats'; + $return['message'] = 'success'; + return yourls_apply_filter( 'api_stats', $return, $filter, $limit, $start ); } /** * Return array for counts of shorturls and clicks * + * @return array */ function yourls_api_db_stats() { - $return = array( - 'db-stats' => yourls_get_db_stats(), - 'statusCode' => 200, - 'simple' => 'Need either XML or JSON format for stats', - 'message' => 'success', - ); - - return yourls_apply_filter( 'api_db_stats', $return ); + $return = array( + 'db-stats' => yourls_get_db_stats(), + 'statusCode' => '200', + 'simple' => 'Need either XML or JSON format for stats', + 'message' => 'success', + ); + + return yourls_apply_filter( 'api_db_stats', $return ); } /** * Return array for API stat requests * + * @param string $shorturl Short URL to check + * @return array */ function yourls_api_url_stats( $shorturl ) { - $keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc' - $keyword = yourls_sanitize_keyword( $keyword ); + $keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc' + $keyword = yourls_sanitize_keyword( $keyword ); - $return = yourls_get_keyword_stats( $keyword ); - $return['simple'] = 'Need either XML or JSON format for stats'; - return yourls_apply_filter( 'api_url_stats', $return, $shorturl ); + $return = yourls_get_keyword_stats( $keyword ); + $return['simple'] = 'Need either XML or JSON format for stats'; + return yourls_apply_filter( 'api_url_stats', $return, $shorturl ); } /** * Expand short url to long url * + * @param string $shorturl Short URL to expand + * @return array */ function yourls_api_expand( $shorturl ) { - $keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc' - $keyword = yourls_sanitize_keyword( $keyword ); + $keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc' + $keyword = yourls_sanitize_keyword( $keyword ); - $longurl = yourls_get_keyword_longurl( $keyword ); + $longurl = yourls_get_keyword_longurl( $keyword ); - if( $longurl ) { - $return = array( - 'keyword' => $keyword, - 'shorturl' => yourls_link($keyword), - 'longurl' => $longurl, + if( $longurl ) { + $return = array( + 'keyword' => $keyword, + 'shorturl' => yourls_link($keyword), + 'longurl' => $longurl, 'title' => yourls_get_keyword_title( $keyword ), - 'simple' => $longurl, - 'message' => 'success', - 'statusCode' => 200, - ); - } else { - $return = array( - 'keyword' => $keyword, - 'simple' => 'not found', - 'message' => 'Error: short URL not found', - 'errorCode' => 404, - ); - } - - return yourls_apply_filter( 'api_expand', $return, $shorturl ); + 'simple' => $longurl, + 'message' => 'success', + 'statusCode' => '200', + ); + } else { + $return = array( + 'keyword' => $keyword, + 'simple' => 'not found', + 'message' => 'Error: short URL not found', + 'errorCode' => '404', + ); + } + + return yourls_apply_filter( 'api_expand', $return, $shorturl ); } diff --git a/includes/functions-auth.php b/includes/functions-auth.php index 44630e842..cadf538b4 100644 --- a/includes/functions-auth.php +++ b/includes/functions-auth.php @@ -7,262 +7,277 @@ /** * Show login form if required * + * @return void */ function yourls_maybe_require_auth() { - if( yourls_is_private() ) { - yourls_do_action( 'require_auth' ); - require_once( YOURLS_INC.'/auth.php' ); - } else { - yourls_do_action( 'require_no_auth' ); - } + if( yourls_is_private() ) { + yourls_do_action( 'require_auth' ); + require_once( YOURLS_INC.'/auth.php' ); + } else { + yourls_do_action( 'require_no_auth' ); + } } /** * Check for valid user via login form or stored cookie. Returns true or an error message * + * @return bool|string|mixed true if valid user, error message otherwise. Can also call yourls_die() or redirect to login page. Oh my. */ function yourls_is_valid_user() { - // Allow plugins to short-circuit the whole function - $pre = yourls_apply_filter( 'shunt_is_valid_user', null ); - if ( null !== $pre ) { - return $pre; - } - - // $unfiltered_valid : are credentials valid? Boolean value. It's "unfiltered" to allow plugins to eventually filter it. - $unfiltered_valid = false; - - // Logout request - if( isset( $_GET['action'] ) && $_GET['action'] == 'logout' ) { - yourls_do_action( 'logout' ); - yourls_store_cookie( null ); - return yourls__( 'Logged out successfully' ); - } - - // Check cookies or login request. Login form has precedence. - - yourls_do_action( 'pre_login' ); - - // Determine auth method and check credentials - if - // API only: Secure (no login or pwd) and time limited token - // ?timestamp=12345678&signature=md5(totoblah12345678) - ( yourls_is_API() && - isset( $_REQUEST['timestamp'] ) && !empty($_REQUEST['timestamp'] ) && - isset( $_REQUEST['signature'] ) && !empty($_REQUEST['signature'] ) - ) - { - yourls_do_action( 'pre_login_signature_timestamp' ); - $unfiltered_valid = yourls_check_signature_timestamp(); - } - - elseif - // API only: Secure (no login or pwd) - // ?signature=md5(totoblah) - ( yourls_is_API() && - !isset( $_REQUEST['timestamp'] ) && - isset( $_REQUEST['signature'] ) && !empty( $_REQUEST['signature'] ) - ) - { - yourls_do_action( 'pre_login_signature' ); - $unfiltered_valid = yourls_check_signature(); - } - - elseif - // API or normal: login with username & pwd - ( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] ) - && !empty( $_REQUEST['username'] ) && !empty( $_REQUEST['password'] ) ) - { - yourls_do_action( 'pre_login_username_password' ); - $unfiltered_valid = yourls_check_username_password(); - } - - elseif - // Normal only: cookies - ( !yourls_is_API() && - isset( $_COOKIE[ yourls_cookie_name() ] ) ) - { - yourls_do_action( 'pre_login_cookie' ); - $unfiltered_valid = yourls_check_auth_cookie(); - } - - // Regardless of validity, allow plugins to filter the boolean and have final word - $valid = yourls_apply_filter( 'is_valid_user', $unfiltered_valid ); - - // Login for the win! - if ( $valid ) { - yourls_do_action( 'login' ); - - // (Re)store encrypted cookie if needed - if ( !yourls_is_API() ) { - yourls_store_cookie( YOURLS_USER ); - - // Login form : redirect to requested URL to avoid re-submitting the login form on page reload - if( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] ) && isset( $_SERVER['REQUEST_URI'] ) ) { - // The return makes sure we exit this function before waiting for redirection. - // This fixes #3189 and honestly I'm not sure why. - return yourls_redirect( yourls_sanitize_url_safe($_SERVER['REQUEST_URI']) ); - } - } - - // Login successful - return true; - } - - // Login failed - yourls_do_action( 'login_failed' ); - - if ( isset( $_REQUEST['username'] ) || isset( $_REQUEST['password'] ) ) { - return yourls__( 'Invalid username or password' ); - } else { - return yourls__( 'Please log in' ); - } + // Allow plugins to short-circuit the whole function + $pre = yourls_apply_filter( 'shunt_is_valid_user', null ); + if ( null !== $pre ) { + return $pre; + } + + // $unfiltered_valid : are credentials valid? Boolean value. It's "unfiltered" to allow plugins to eventually filter it. + $unfiltered_valid = false; + + // Logout request + if( isset( $_GET['action'] ) && $_GET['action'] == 'logout' && isset( $_REQUEST['nonce'] ) ) { + // The logout nonce is associated to fake user 'logout' since at this point we don't know the real user + yourls_verify_nonce('admin_logout', $_REQUEST['nonce'], 'logout'); + yourls_do_action( 'logout' ); + yourls_store_cookie( '' ); + return yourls__( 'Logged out successfully' ); + } + + // Check cookies or login request. Login form has precedence. + + yourls_do_action( 'pre_login' ); + + // Determine auth method and check credentials + if + // API only: Secure (no login or pwd) and time limited token + // ?timestamp=12345678&signature=md5(totoblah12345678) + ( yourls_is_API() && + isset( $_REQUEST['timestamp'] ) && !empty($_REQUEST['timestamp'] ) && + isset( $_REQUEST['signature'] ) && !empty($_REQUEST['signature'] ) + ) + { + yourls_do_action( 'pre_login_signature_timestamp' ); + $unfiltered_valid = yourls_check_signature_timestamp(); + } + + elseif + // API only: Secure (no login or pwd) + // ?signature=md5(totoblah) + ( yourls_is_API() && + !isset( $_REQUEST['timestamp'] ) && + isset( $_REQUEST['signature'] ) && !empty( $_REQUEST['signature'] ) + ) + { + yourls_do_action( 'pre_login_signature' ); + $unfiltered_valid = yourls_check_signature(); + } + + elseif + // API or normal: login with username & pwd + ( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] ) + && !empty( $_REQUEST['username'] ) && !empty( $_REQUEST['password'] ) ) + { + yourls_do_action( 'pre_login_username_password' ); + $unfiltered_valid = yourls_check_username_password(); + } + + elseif + // Normal only: cookies + ( !yourls_is_API() && + isset( $_COOKIE[ yourls_cookie_name() ] ) ) + { + yourls_do_action( 'pre_login_cookie' ); + $unfiltered_valid = yourls_check_auth_cookie(); + } + + // Regardless of validity, allow plugins to filter the boolean and have final word + $valid = yourls_apply_filter( 'is_valid_user', $unfiltered_valid ); + + // Login for the win! + if ( $valid ) { + yourls_do_action( 'login' ); + + // (Re)store encrypted cookie if needed + if ( !yourls_is_API() ) { + yourls_store_cookie( YOURLS_USER ); + + // Login form : redirect to requested URL to avoid re-submitting the login form on page reload + if( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] ) && isset( $_SERVER['REQUEST_URI'] ) ) { + // The return makes sure we exit this function before waiting for redirection. + // See #3189 and note in yourls_redirect() + return yourls_redirect( yourls_sanitize_url_safe($_SERVER['REQUEST_URI']) ); + } + } + + // Login successful + return true; + } + + // Login failed + yourls_do_action( 'login_failed' ); + + if ( isset( $_REQUEST['username'] ) || isset( $_REQUEST['password'] ) ) { + return yourls__( 'Invalid username or password' ); + } else { + return yourls__( 'Please log in' ); + } } /** * Check auth against list of login=>pwd. Sets user if applicable, returns bool * + * @return bool true if login/pwd pair is valid (and sets user if applicable), false otherwise */ function yourls_check_username_password() { - global $yourls_user_passwords; + global $yourls_user_passwords; - // If login form (not API), check for nonce + // If login form (not API), check for nonce if(!yourls_is_API()) { yourls_verify_nonce('admin_login'); } - if( isset( $yourls_user_passwords[ $_REQUEST['username'] ] ) && yourls_check_password_hash( $_REQUEST['username'], $_REQUEST['password'] ) ) { - yourls_set_user( $_REQUEST['username'] ); - return true; - } - return false; + if( isset( $yourls_user_passwords[ $_REQUEST['username'] ] ) && yourls_check_password_hash( $_REQUEST['username'], $_REQUEST['password'] ) ) { + yourls_set_user( $_REQUEST['username'] ); + return true; + } + return false; } /** * Check a submitted password sent in plain text against stored password which can be a salted hash * + * @param string $user + * @param string $submitted_password + * @return bool */ -function yourls_check_password_hash( $user, $submitted_password ) { - global $yourls_user_passwords; +function yourls_check_password_hash($user, $submitted_password ) { + global $yourls_user_passwords; - if( !isset( $yourls_user_passwords[ $user ] ) ) - return false; + if( !isset( $yourls_user_passwords[ $user ] ) ) + return false; - if ( yourls_has_phpass_password( $user ) ) { - // Stored password is hashed with phpass - list( , $hash ) = explode( ':', $yourls_user_passwords[ $user ] ); - $hash = str_replace( '!', '$', $hash ); - return ( yourls_phpass_check( $submitted_password, $hash ) ); - } else if( yourls_has_md5_password( $user ) ) { - // Stored password is a salted md5 hash: "md5:<$r = rand(10000,99999)>:
; ?>/images/yourls-logo.svg?v=<?php echo YOURLS_VERSION; ?> "YOURLS"){kind=logo}