+ $url = $_GET['up'] . $_GET['us'] . $_GET['ur'];
+ }
+ $keyword = ( isset( $_GET['k'] ) ? ( $_GET['k'] ) : '' );
+ $title = ( isset( $_GET['t'] ) ? ( $_GET['t'] ) : '' );
+ $return = yourls_add_new_link( $url, $keyword, $title );
+
+ // If fails because keyword already exist, retry with no keyword
+ if ( isset( $return['status'] ) && $return['status'] == 'fail' && isset( $return['code'] ) && $return['code'] == 'error:keyword' ) {
+ $msg = $return['message'];
+ $return = yourls_add_new_link( $url, '' );
+ $return['message'] .= ' ('.$msg.')';
+ }
+
+ // Stop here if bookmarklet with a JSON callback function
+ if( isset( $_GET['jsonp'] ) && $_GET['jsonp'] == 'yourls' ) {
+ $short = $return['shorturl'] ? $return['shorturl'] : '';
+ $message = $return['message'];
+ yourls_content_type_header( 'application/javascript' );
+ echo yourls_apply_filter( 'bookmarklet_jsonp', "yourls_callback({'short_url':'$short','message':'$message'});" );
+
+ die();
+ }
+
+ // Now use the URL that has been sanitized and returned by yourls_add_new_link()
+ $url = $return['url']['url'];
+ $where['sql'] .= ' AND `url` LIKE :url ';
$where['binds']['url'] = $url;
- $page = $total_pages = $perpage = 1;
- $offset = 0;
-
- $text = ( isset( $_GET['s'] ) ? stripslashes( $_GET['s'] ) : '' );
-
- // Sharing with social bookmarklets
- if( !empty($_GET['share']) ) {
- yourls_do_action( 'pre_share_redirect' );
- switch ( $_GET['share'] ) {
- case 'twitter':
- // share with Twitter
- $destination = sprintf( "https://twitter.com/intent/tweet?url=%s&text=%s", urlencode( $return['shorturl'] ), urlencode( $title ) );
- yourls_redirect( $destination, 303 );
-
- // Deal with the case when redirection failed:
- $return['status'] = 'error';
- $return['errorCode'] = 400;
- $return['message'] = yourls_s( 'Short URL created, but could not redirect to %s !', 'Twitter' );
- break;
-
- case 'facebook':
- // share with Facebook
- $destination = sprintf( "https://www.facebook.com/sharer/sharer.php?u=%s&t=%s", urlencode( $return['shorturl'] ), urlencode( $title ) );
- yourls_redirect( $destination, 303 );
-
- // Deal with the case when redirection failed:
- $return['status'] = 'error';
- $return['errorCode'] = 400;
- $return['message'] = yourls_s( 'Short URL created, but could not redirect to %s !', 'Facebook' );
- break;
-
- case 'tumblr':
- // share with Tumblr
- $destination = sprintf( "https://www.tumblr.com/share?v=3&u=%s&t=%s&s=%s", urlencode( $return['shorturl'] ), urlencode( $title ), urlencode( $text ) );
- yourls_redirect( $destination, 303 );
-
- // Deal with the case when redirection failed:
- $return['status'] = 'error';
- $return['errorCode'] = 400;
- $return['message'] = yourls_s( 'Short URL created, but could not redirect to %s !', 'Tumblr' );
- break;
-
- default:
- // Is there a custom registered social bookmark?
- yourls_do_action( 'share_redirect_' . $_GET['share'], $return );
-
- // Still here? That was an unknown 'share' method, then.
- $return['status'] = 'error';
- $return['errorCode'] = 400;
- $return['message'] = yourls__( 'Unknown "Share" bookmarklet' );
- break;
- }
- }
+ $page = $total_pages = $perpage = 1;
+ $offset = 0;
+
+ $text = ( isset( $_GET['s'] ) ? stripslashes( $_GET['s'] ) : '' );
+
+ // Sharing with social bookmarklets
+ if( !empty($_GET['share']) ) {
+ yourls_do_action( 'pre_share_redirect' );
+ switch ( $_GET['share'] ) {
+ case 'twitter':
+ // share with Twitter
+ $destination = sprintf( "https://twitter.com/intent/tweet?url=%s&text=%s", urlencode( $return['shorturl'] ), urlencode( $title ) );
+ yourls_redirect( $destination, 303 );
+
+ // Deal with the case when redirection failed:
+ $return['status'] = 'error';
+ $return['errorCode'] = '400';
+ $return['message'] = yourls_s( 'Short URL created, but could not redirect to %s !', 'Twitter' );
+ break;
+
+ case 'facebook':
+ // share with Facebook
+ $destination = sprintf( "https://www.facebook.com/sharer/sharer.php?u=%s&t=%s", urlencode( $return['shorturl'] ), urlencode( $title ) );
+ yourls_redirect( $destination, 303 );
+
+ // Deal with the case when redirection failed:
+ $return['status'] = 'error';
+ $return['errorCode'] = '400';
+ $return['message'] = yourls_s( 'Short URL created, but could not redirect to %s !', 'Facebook' );
+ break;
+
+ case 'tumblr':
+ // share with Tumblr
+ $destination = sprintf( "https://www.tumblr.com/share?v=3&u=%s&t=%s&s=%s", urlencode( $return['shorturl'] ), urlencode( $title ), urlencode( $text ) );
+ yourls_redirect( $destination, 303 );
+
+ // Deal with the case when redirection failed:
+ $return['status'] = 'error';
+ $return['errorCode'] = '400';
+ $return['message'] = yourls_s( 'Short URL created, but could not redirect to %s !', 'Tumblr' );
+ break;
+
+ default:
+ // Is there a custom registered social bookmark?
+ yourls_do_action( 'share_redirect_' . $_GET['share'], $return );
+
+ // Still here? That was an unknown 'share' method, then.
+ $return['status'] = 'error';
+ $return['errorCode'] = '400';
+ $return['message'] = yourls__( 'Unknown "Share" bookmarklet' );
+ break;
+ }
+ }
// This is not a bookmarklet
} else {
- $is_bookmark = false;
-
- // Checking $page, $offset, $perpage
- if( empty($page) || $page == 0 ) {
- $page = 1;
- }
- if( empty($offset) ) {
- $offset = 0;
- }
- if( empty($perpage) || $perpage == 0) {
- $perpage = 50;
- }
-
- // Determine $offset
- $offset = ( $page-1 ) * $perpage;
-
- // Determine Max Number Of Items To Display On Page
- if( ( $offset + $perpage ) > $total_items ) {
- $max_on_page = $total_items;
- } else {
- $max_on_page = ( $offset + $perpage );
- }
-
- // Determine Number Of Items To Display On Page
- if ( ( $offset + 1 ) > $total_items ) {
- $display_on_page = $total_items;
- } else {
- $display_on_page = ( $offset + 1 );
- }
-
- // Determine Total Amount Of Pages
- $total_pages = ceil( $total_items / $perpage );
+ $is_bookmark = false;
+
+ // Checking $page, $offset, $perpage
+ if( empty($page) || $page == 0 ) {
+ $page = 1;
+ }
+ if( empty($offset) ) {
+ $offset = 0;
+ }
+ if( empty($perpage) || $perpage == 0) {
+ $perpage = 50;
+ }
+
+ // Determine $offset
+ $offset = ( $page-1 ) * $perpage;
+
+ // Determine Max Number Of Items To Display On Page
+ if( ( $offset + $perpage ) > $total_items ) {
+ $max_on_page = $total_items;
+ } else {
+ $max_on_page = ( $offset + $perpage );
+ }
+
+ // Determine Number Of Items To Display On Page
+ if ( ( $offset + 1 ) > $total_items ) {
+ $display_on_page = $total_items;
+ } else {
+ $display_on_page = ( $offset + 1 );
+ }
+
+ // Determine Total Amount Of Pages
+ $total_pages = ceil( $total_items / $perpage );
}
@@ -241,12 +244,18 @@
yourls_do_action( 'admin_page_before_content' );
if ( !$is_bookmark ) { ?>
-
- %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,22 +279,22 @@
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();
@@ -295,17 +304,17 @@
$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'] );
$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' : '';
@@ -318,7 +327,7 @@
yourls_do_action( 'admin_page_after_table' );
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 3b004508c..3d4b99a1a 100644
--- a/admin/install.php
+++ b/admin/install.php
@@ -9,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'] );
}
@@ -54,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 '
» ' . yourls__( 'YOURLS Administration Page') . '
';
+ }
+ ?>
+
- %1$s installed, and %2$s activated', $plugins_count, $count_active ); ?>
-
-
-
-
-
-
-
- $plugin ) {
-
- // default fields to read from the plugin header
- $fields = array(
- 'name' => 'Plugin Name',
- 'uri' => 'Plugin URI',
- 'desc' => 'Description',
- 'version' => 'Version',
- 'author' => 'Author',
- 'author_uri' => 'Author URI'
- );
-
- // Loop through all default fields, get value if any and reset it
- foreach( $fields as $field=>$value ) {
- if( isset( $plugin[ $value ] ) ) {
- $data[ $field ] = $plugin[ $value ];
- } else {
- $data[ $field ] = yourls__('(no info)');
- }
- unset( $plugin[$value] );
- }
-
- $plugindir = trim( dirname( $file ), '/' );
-
- if( yourls_is_active_plugin( $file ) ) {
- $class = 'active';
- $action_url = yourls_nonce_url( 'manage_plugins', yourls_add_query_arg( array('action' => 'deactivate', 'plugin' => $plugindir ), yourls_admin_url('plugins.php') ) );
- $action_anchor = yourls__( 'Deactivate' );
- } else {
- $class = 'inactive';
- $action_url = yourls_nonce_url( 'manage_plugins', yourls_add_query_arg( array('action' => 'activate', 'plugin' => $plugindir ), yourls_admin_url('plugins.php') ) );
- $action_anchor = yourls__( 'Activate' );
- }
-
- // Other "Fields: Value" in the header? Get them too
- if( $plugin ) {
- foreach( $plugin as $extra_field=>$extra_value ) {
- $data['desc'] .= "$extra_field : $extra_value";
- unset( $plugin[$extra_value] );
- }
- }
-
- $data['desc'] .= '' . yourls_s( 'plugin file location: %s', $file) . ' ';
-
- printf( "%s %s %s %s %s
-
-
-
-
- plugin.php.' ); ?>
-
- Plugin list.' ); ?>
-
+
+ %1$s installed, and %2$s activated', $plugins_count, $count_active ); ?>
+
+
+
+
+
+
+
+ $plugin ) {
+
+ // default fields to read from the plugin header
+ $fields = array(
+ 'name' => 'Plugin Name',
+ 'uri' => 'Plugin URI',
+ 'desc' => 'Description',
+ 'version' => 'Version',
+ 'author' => 'Author',
+ 'author_uri' => 'Author URI'
+ );
+
+ // Loop through all default fields, get value if any and reset it
+ foreach( $fields as $field=>$value ) {
+ if( isset( $plugin[ $value ] ) ) {
+ $data[ $field ] = $plugin[ $value ];
+ } else {
+ $data[ $field ] = yourls__('(no info)');
+ # If it's a URL, set to #
+ if( in_array( $field, array('uri', 'author_uri') ) ) {
+ $data[$field] = '#' . $data[$field];
+ }
+ }
+ unset( $plugin[$value] );
+ }
+
+ $plugindir = trim( dirname( $file ), '/' );
+
+ if( yourls_is_active_plugin( $file ) ) {
+ $class = 'active';
+ $action_url = yourls_nonce_url( 'manage_plugins', yourls_add_query_arg( array('action' => 'deactivate', 'plugin' => $plugindir ), yourls_admin_url('plugins.php') ) );
+ $action_anchor = yourls__( 'Deactivate' );
+ } else {
+ $class = 'inactive';
+ $action_url = yourls_nonce_url( 'manage_plugins', yourls_add_query_arg( array('action' => 'activate', 'plugin' => $plugindir ), yourls_admin_url('plugins.php') ) );
+ $action_anchor = yourls__( 'Activate' );
+ }
+
+ // Other "Fields: Value" in the header? Get them too
+ if( $plugin ) {
+ foreach( $plugin as $extra_field=>$extra_value ) {
+ $data['desc'] .= "$extra_field : $extra_value";
+ unset( $plugin[$extra_value] );
+ }
+ }
+
+ $data['desc'] .= '' . yourls_s( 'plugin file location: %s', $file) . ' ';
+
+ printf( "%s %s %s %s %s
+
+
+
+
+ plugin.php.' ); ?>
+
+ Plugin list.' ); ?>
+
diff --git a/admin/tools.php b/admin/tools.php
index fd1d167b5..b77206169 100644
--- a/admin/tools.php
+++ b/admin/tools.php
@@ -8,49 +8,49 @@
yourls_html_menu();
?>
-
+
- 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' ); ?>
-
+
-
+
diff --git a/admin/upgrade.php b/admin/upgrade.php
index 536a9f873..957870cda 100644
--- a/admin/upgrade.php
+++ b/admin/upgrade.php
@@ -8,73 +8,73 @@
yourls_html_logo();
yourls_html_menu();
?>
- back to play !', yourls_admin_url('index.php') ) . '';
+ echo '' . 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
- 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 :)' ); ?>
-
-
-
+ backup your database
+ 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 :)' ); ?>
+
+
+ ' . 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 5b41af073..e604afd80 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"source": "https://github.com/YOURLS/YOURLS"
},
"require": {
- "php": ">=7.4",
+ "php": "^8.1",
"ext-dom": "*",
"ext-filter": "*",
"ext-hash": "*",
@@ -27,7 +27,7 @@
"rmccue/requests" : "^2.0",
"pomo/pomo" : "^1.4",
"geoip2/geoip2" : "^2.10",
- "aura/sql": "^3.0",
+ "aura/sql": "^6.0",
"jakeasmith/http_build_url": "^1.0",
"symfony/polyfill-mbstring": "^1.15",
"symfony/polyfill-intl-idn": "^1.17",
@@ -39,7 +39,7 @@
"config": {
"vendor-dir": "includes/vendor",
"platform": {
- "php": "7.4.0"
+ "php": "8.1.0"
}
},
"autoload": {
diff --git a/composer.lock b/composer.lock
index 1db41c64c..764732b14 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": "9b65f2d0608ea42bf57901047d69e5bb",
+ "content-hash": "5e687d6aa23e978bd628bd3cda68d716",
"packages": [
{
"name": "aura/sql",
- "version": "3.1.0",
+ "version": "6.0.0",
"source": {
"type": "git",
"url": "https://github.com/auraphp/Aura.Sql.git",
- "reference": "88d8b8ed1bcfd588a649fdc7e7ac89ec047abbca"
+ "reference": "8e2bb362e8953198df3682c9122e8b9edab5ff20"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/auraphp/Aura.Sql/zipball/88d8b8ed1bcfd588a649fdc7e7ac89ec047abbca",
- "reference": "88d8b8ed1bcfd588a649fdc7e7ac89ec047abbca",
+ "url": "https://api.github.com/repos/auraphp/Aura.Sql/zipball/8e2bb362e8953198df3682c9122e8b9edab5ff20",
+ "reference": "8e2bb362e8953198df3682c9122e8b9edab5ff20",
"shasum": ""
},
"require": {
- "php": ">=5.6.0",
- "psr/log": "^1.0 || ^2.0"
+ "ext-pdo": "*",
+ "php": "^8.4",
+ "psr/log": "^1.0 || ^2.0 || ^3.0"
},
"require-dev": {
"pds/skeleton": "~1.0",
- "yoast/phpunit-polyfills": "~1.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.1.0"
+ "source": "https://github.com/auraphp/Aura.Sql/tree/6.0.0"
},
- "time": "2022-04-28T05:11:23+00:00"
+ "time": "2025-01-22T06:43:21+00:00"
},
{
"name": "composer/ca-bundle",
- "version": "1.3.4",
+ "version": "1.5.5",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "69098eca243998b53eed7a48d82dedd28b447cd5"
+ "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/69098eca243998b53eed7a48d82dedd28b447cd5",
- "reference": "69098eca243998b53eed7a48d82dedd28b447cd5",
+ "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 || ^6.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.3.4"
+ "source": "https://github.com/composer/ca-bundle/tree/1.5.5"
},
"funding": [
{
@@ -137,14 +138,14 @@
"type": "tidelift"
}
],
- "time": "2022-10-12T12:08:29+00:00"
+ "time": "2025-01-08T16:17:16+00:00"
},
{
"name": "geoip2/geoip2",
"version": "v2.13.0",
"source": {
"type": "git",
- "url": "git@github.com:maxmind/GeoIP2-php.git",
+ "url": "https://github.com/maxmind/GeoIP2-php.git",
"reference": "6a41d8fbd6b90052bc34dff3b4252d0f88067b23"
},
"dist": {
@@ -191,6 +192,10 @@
"geolocation",
"maxmind"
],
+ "support": {
+ "issues": "https://github.com/maxmind/GeoIP2-php/issues",
+ "source": "https://github.com/maxmind/GeoIP2-php/tree/v2.13.0"
+ },
"time": "2022-08-05T20:32:58+00:00"
},
{
@@ -232,29 +237,27 @@
},
{
"name": "maxmind-db/reader",
- "version": "v1.11.0",
+ "version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git",
- "reference": "b1f3c0699525336d09cc5161a2861268d9f2ae5b"
+ "reference": "5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b1f3c0699525336d09cc5161a2861268d9f2ae5b",
- "reference": "b1f3c0699525336d09cc5161a2861268d9f2ae5b",
+ "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90",
+ "reference": "5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90",
"shasum": ""
},
"require": {
"php": ">=7.2"
},
"conflict": {
- "ext-maxminddb": "<1.10.1,>=2.0.0"
+ "ext-maxminddb": "<1.11.1 || >=2.0.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "3.*",
- "php-coveralls/php-coveralls": "^2.1",
"phpstan/phpstan": "*",
- "phpunit/phpcov": ">=6.0.0",
"phpunit/phpunit": ">=8.0.0,<10.0.0",
"squizlabs/php_codesniffer": "3.*"
},
@@ -291,29 +294,29 @@
],
"support": {
"issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues",
- "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.11.0"
+ "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.12.0"
},
- "time": "2021-10-18T15:23:10+00:00"
+ "time": "2024-11-14T22:43:47+00:00"
},
{
"name": "maxmind/web-service-common",
- "version": "v0.9.0",
+ "version": "v0.10.0",
"source": {
"type": "git",
"url": "https://github.com/maxmind/web-service-common-php.git",
- "reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53"
+ "reference": "d7c7c42fc31bff26e0ded73a6e187bcfb193f9c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
- "reference": "4dc5a3e8df38aea4ca3b1096cee3a038094e9b53",
+ "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": "3.*",
@@ -342,9 +345,9 @@
"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.9.0"
+ "source": "https://github.com/maxmind/web-service-common-php/tree/v0.10.0"
},
- "time": "2022-03-28T17:43:20+00:00"
+ "time": "2024-11-14T23:14:52+00:00"
},
{
"name": "ozh/bookmarkletgen",
@@ -461,30 +464,30 @@
},
{
"name": "psr/log",
- "version": "1.1.4",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+ "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+ "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/",
@@ -505,22 +508,22 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/1.1.4"
+ "source": "https://github.com/php-fig/log/tree/3.0.2"
},
- "time": "2021-05-03T11:20:27+00:00"
+ "time": "2024-09-11T13:17:53+00:00"
},
{
"name": "rmccue/requests",
- "version": "v2.0.5",
+ "version": "v2.0.15",
"source": {
"type": "git",
"url": "https://github.com/WordPress/Requests.git",
- "reference": "b717f1d2f4ef7992ec0c127747ed8b7e170c2f49"
+ "reference": "877cd66169755899682f1595e057334b40d9d149"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/WordPress/Requests/zipball/b717f1d2f4ef7992ec0c127747ed8b7e170c2f49",
- "reference": "b717f1d2f4ef7992ec0c127747ed8b7e170c2f49",
+ "url": "https://api.github.com/repos/WordPress/Requests/zipball/877cd66169755899682f1595e057334b40d9d149",
+ "reference": "877cd66169755899682f1595e057334b40d9d149",
"shasum": ""
},
"require": {
@@ -538,6 +541,12 @@
"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": {
"files": [
@@ -588,7 +597,7 @@
"issues": "https://github.com/WordPress/Requests/issues",
"source": "https://github.com/WordPress/Requests"
},
- "time": "2022-10-11T08:15:28+00:00"
+ "time": "2025-01-21T10:13:31+00:00"
},
{
"name": "spatie/array-to-xml",
@@ -656,34 +665,30 @@
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "639084e360537a19f9ee352433b84ce831f3d2da"
+ "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da",
- "reference": "639084e360537a19f9ee352433b84ce831f3d2da",
+ "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.27-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -723,7 +728,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
},
"funding": [
{
@@ -739,36 +744,33 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
- "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+ "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.27-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -807,7 +809,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
},
"funding": [
{
@@ -823,24 +825,24 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.27.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
- "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -850,12 +852,9 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -890,83 +889,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.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": "2022-11-03T14:55:06+00:00"
- },
- {
- "name": "symfony/polyfill-php72",
- "version": "v1.27.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
- "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- }
- },
- "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.27.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
@@ -982,17 +905,17 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+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.4",
+ "php": "^8.1",
"ext-dom": "*",
"ext-filter": "*",
"ext-hash": "*",
@@ -1004,7 +927,7 @@
"ext-ctype": "*"
},
"platform-overrides": {
- "php": "7.4.0"
+ "php": "8.1.0"
},
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.6.0"
}
diff --git a/css/style.css b/css/style.css
index d7f50d971..e1d350df7 100644
--- a/css/style.css
+++ b/css/style.css
@@ -203,7 +203,7 @@ td.actions .button_stats {
background:#efe;
}
#login {
- width: 300px;
+ max-width: 300px;
margin: 200px auto 0px auto;
}
#login p{
diff --git a/includes/Config/Init.php b/includes/Config/Init.php
index d9f201247..d97d9ae2f 100644
--- a/includes/Config/Init.php
+++ b/includes/Config/Init.php
@@ -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();
@@ -110,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()) {
diff --git a/includes/Database/Logger.php b/includes/Database/Logger.php
index 6c77adea8..3c256dbda 100644
--- a/includes/Database/Logger.php
+++ b/includes/Database/Logger.php
@@ -49,7 +49,7 @@ class Logger extends AbstractLogger {
*
* @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 be8f56c2e..ea9e4d222 100644
--- a/includes/Database/Profiler.php
+++ b/includes/Database/Profiler.php
@@ -23,7 +23,7 @@ class Profiler extends \Aura\Sql\Profiler\Profiler {
* @param array $values The values bound to the statement, if any.
* @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 f13e145d1..4053f3383 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);
}
@@ -404,22 +405,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);
}
}
diff --git a/includes/Views/AdminParams.php b/includes/Views/AdminParams.php
index 75de39e90..892684da6 100644
--- a/includes/Views/AdminParams.php
+++ b/includes/Views/AdminParams.php
@@ -222,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']) >= 0) ?
- 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 58e15c979..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,12 +36,12 @@
// 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 successful. Remove flag from DB if any.
@@ -59,5 +59,5 @@
yourls_add_notice( $message );
}
}
- }
+ }
}
diff --git a/includes/functions-api.php b/includes/functions-api.php
index 45395ac89..6ef3e2740 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,43 @@ 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;
+ $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;
}
@@ -169,10 +169,10 @@ function yourls_api_output( $mode, $output, $send_headers = true, $echo = true )
* @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 );
+ $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 );
}
/**
@@ -181,14 +181,14 @@ function yourls_api_stats($filter = 'top', $limit = 10, $start = 0 ) {
* @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 );
}
/**
@@ -198,12 +198,12 @@ function yourls_api_db_stats() {
* @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 );
}
/**
@@ -213,29 +213,29 @@ function yourls_api_url_stats( $shorturl ) {
* @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 f074c21c6..cadf538b4 100644
--- a/includes/functions-auth.php
+++ b/includes/functions-auth.php
@@ -10,12 +10,12 @@
* @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' );
+ }
}
/**
@@ -24,102 +24,102 @@ function yourls_maybe_require_auth() {
* @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;
- }
+ // 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;
+ // $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'] ) ) {
+ // 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.
+ 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']) );
- }
- }
+ return yourls_redirect( yourls_sanitize_url_safe($_SERVER['REQUEST_URI']) );
+ }
+ }
- // Login successful
- return true;
- }
+ // Login successful
+ return true;
+ }
- // Login failed
- yourls_do_action( 'login_failed' );
+ // 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' );
- }
+ if ( isset( $_REQUEST['username'] ) || isset( $_REQUEST['password'] ) ) {
+ return yourls__( 'Invalid username or password' );
+ } else {
+ return yourls__( 'Please log in' );
+ }
}
/**
@@ -128,18 +128,18 @@ function yourls_is_valid_user() {
* @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;
}
/**
@@ -150,24 +150,24 @@ function yourls_check_username_password() {
* @return bool
*/
function yourls_check_password_hash($user, $submitted_password ) {
- global $yourls_user_passwords;
+ 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
- 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)>:"
- list( , $salt, ) = explode( ':', $yourls_user_passwords[ $user ] );
- return( $yourls_user_passwords[ $user ] == 'md5:'.$salt.':'.md5( $salt . $submitted_password ) );
- } else {
- // Password stored in clear text
- return( $yourls_user_passwords[ $user ] === $submitted_password );
- }
+ if ( yourls_has_phpass_password( $user ) ) {
+ // Stored password is hashed
+ 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)>:"
+ list( , $salt, ) = explode( ':', $yourls_user_passwords[ $user ] );
+ return( $yourls_user_passwords[ $user ] == 'md5:'.$salt.':'.md5( $salt . $submitted_password ) );
+ } else {
+ // Password stored in clear text
+ return( $yourls_user_passwords[ $user ] === $submitted_password );
+ }
}
/**
@@ -178,66 +178,66 @@ function yourls_check_password_hash($user, $submitted_password ) {
* @return true|string if overwrite was successful, an error message otherwise
*/
function yourls_hash_passwords_now( $config_file ) {
- if( !is_readable( $config_file ) ) {
+ if( !is_readable( $config_file ) ) {
yourls_debug_log( 'Cannot hash passwords: cannot read file ' . $config_file );
return 'cannot read file'; // not sure that can actually happen...
}
- if( !is_writable( $config_file ) ) {
+ if( !is_writable( $config_file ) ) {
yourls_debug_log( 'Cannot hash passwords: cannot write file ' . $config_file );
- return 'cannot write file';
+ return 'cannot write file';
}
$yourls_user_passwords = [];
- // Include file to read value of $yourls_user_passwords
- // Temporary suppress error reporting to avoid notices about redeclared constants
- $errlevel = error_reporting();
- error_reporting( 0 );
- require $config_file;
- error_reporting( $errlevel );
+ // Include file to read value of $yourls_user_passwords
+ // Temporary suppress error reporting to avoid notices about redeclared constants
+ $errlevel = error_reporting();
+ error_reporting( 0 );
+ require $config_file;
+ error_reporting( $errlevel );
- $configdata = file_get_contents( $config_file );
+ $configdata = file_get_contents( $config_file );
if( $configdata == false ) {
yourls_debug_log('Cannot hash passwords: file_get_contents() false with ' . $config_file);
return 'could not read file';
}
- $to_hash = 0; // keep track of number of passwords that need hashing
- foreach ( $yourls_user_passwords as $user => $password ) {
+ $to_hash = 0; // keep track of number of passwords that need hashing
+ foreach ( $yourls_user_passwords as $user => $password ) {
// avoid "deprecated" warning when password is null -- see test case in tests/data/auth/preg_replace_problem.php
$password ??= '';
- if ( !yourls_has_phpass_password( $user ) && !yourls_has_md5_password( $user ) ) {
- $to_hash++;
- $hash = yourls_phpass_hash( $password );
- // PHP would interpret $ as a variable, so replace it in storage.
- $hash = str_replace( '$', '!', $hash );
- $quotes = "'" . '"';
- $pattern = "/[$quotes]" . preg_quote( $user, '/' ) . "[$quotes]\s*=>\s*[$quotes]" . preg_quote( $password, '/' ) . "[$quotes]/";
- $replace = "'$user' => 'phpass:$hash' /* Password encrypted by YOURLS */ ";
- $count = 0;
- $configdata = preg_replace( $pattern, $replace, $configdata, -1, $count );
- // There should be exactly one replacement. Otherwise, fast fail.
- if ( $count != 1 ) {
- yourls_debug_log( "Problem with preg_replace for password hash of user $user" );
- return 'preg_replace problem';
- }
- }
- }
-
- if( $to_hash == 0 ) {
+ if ( !yourls_has_phpass_password( $user ) && !yourls_has_md5_password( $user ) ) {
+ $to_hash++;
+ $hash = yourls_phpass_hash( $password );
+ // PHP would interpret $ as a variable, so replace it in storage.
+ $hash = str_replace( '$', '!', $hash );
+ $quotes = "'" . '"';
+ $pattern = "/[$quotes]" . preg_quote( $user, '/' ) . "[$quotes]\s*=>\s*[$quotes]" . preg_quote( $password, '/' ) . "[$quotes]/";
+ $replace = "'$user' => 'phpass:$hash' /* Password encrypted by YOURLS */ ";
+ $count = 0;
+ $configdata = preg_replace( $pattern, $replace, $configdata, -1, $count );
+ // There should be exactly one replacement. Otherwise, fast fail.
+ if ( $count != 1 ) {
+ yourls_debug_log( "Problem with preg_replace for password hash of user $user" );
+ return 'preg_replace problem';
+ }
+ }
+ }
+
+ if( $to_hash == 0 ) {
yourls_debug_log('Cannot hash passwords: no password found in ' . $config_file);
return 'no password found';
}
- $success = file_put_contents( $config_file, $configdata );
- if ( $success === FALSE ) {
- yourls_debug_log( 'Failed writing to ' . $config_file );
- return 'could not write file';
- }
+ $success = file_put_contents( $config_file, $configdata );
+ if ( $success === FALSE ) {
+ yourls_debug_log( 'Failed writing to ' . $config_file );
+ return 'could not write file';
+ }
yourls_debug_log('Successfully encrypted passwords in ' . basename($config_file));
- return true;
+ return true;
}
/**
@@ -277,7 +277,7 @@ function yourls_phpass_hash( $password ) {
* @return bool true if the hash matches the password, false otherwise
*/
function yourls_phpass_check( $password, $hash ) {
- return password_verify($password, $hash);
+ return password_verify($password, $hash);
}
@@ -288,13 +288,13 @@ function yourls_phpass_check( $password, $hash ) {
* @return bool true if any passwords are cleartext
*/
function yourls_has_cleartext_passwords() {
- global $yourls_user_passwords;
- foreach ( $yourls_user_passwords as $user => $pwdata ) {
- if ( !yourls_has_md5_password( $user ) && !yourls_has_phpass_password( $user ) ) {
- return true;
- }
- }
- return false;
+ global $yourls_user_passwords;
+ foreach ( $yourls_user_passwords as $user => $pwdata ) {
+ if ( !yourls_has_md5_password( $user ) && !yourls_has_phpass_password( $user ) ) {
+ return true;
+ }
+ }
+ return false;
}
/**
@@ -308,11 +308,11 @@ function yourls_has_cleartext_passwords() {
* @return bool true if password hashed, false otherwise
*/
function yourls_has_md5_password( $user ) {
- global $yourls_user_passwords;
- return( isset( $yourls_user_passwords[ $user ] )
- && substr( $yourls_user_passwords[ $user ], 0, 4 ) == 'md5:'
- && strlen( $yourls_user_passwords[ $user ] ) == 42 // http://www.google.com/search?q=the+answer+to+life+the+universe+and+everything
- );
+ global $yourls_user_passwords;
+ return( isset( $yourls_user_passwords[ $user ] )
+ && substr( $yourls_user_passwords[ $user ], 0, 4 ) == 'md5:'
+ && strlen( $yourls_user_passwords[ $user ] ) == 42 // http://www.google.com/search?q=the+answer+to+life+the+universe+and+everything
+ );
}
/**
@@ -327,10 +327,10 @@ function yourls_has_md5_password( $user ) {
* @return bool true if password hashed with password_hash, otherwise false
*/
function yourls_has_phpass_password( $user ) {
- global $yourls_user_passwords;
- return( isset( $yourls_user_passwords[ $user ] )
- && substr( $yourls_user_passwords[ $user ], 0, 7 ) == 'phpass:'
- );
+ global $yourls_user_passwords;
+ return( isset( $yourls_user_passwords[ $user ] )
+ && substr( $yourls_user_passwords[ $user ], 0, 7 ) == 'phpass:'
+ );
}
/**
@@ -339,14 +339,14 @@ function yourls_has_phpass_password( $user ) {
* @return bool true if authenticated, false otherwise
*/
function yourls_check_auth_cookie() {
- global $yourls_user_passwords;
- foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
- if ( yourls_cookie_value( $valid_user ) === $_COOKIE[ yourls_cookie_name() ] ) {
- yourls_set_user( $valid_user );
- return true;
- }
- }
- return false;
+ global $yourls_user_passwords;
+ foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
+ if ( yourls_cookie_value( $valid_user ) === $_COOKIE[ yourls_cookie_name() ] ) {
+ yourls_set_user( $valid_user );
+ return true;
+ }
+ }
+ return false;
}
/**
@@ -380,21 +380,21 @@ function yourls_check_signature_timestamp() {
return false;
}
- // Check signature & timestamp against all possible users
- global $yourls_user_passwords;
- foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
- if (
+ // Check signature & timestamp against all possible users
+ global $yourls_user_passwords;
+ foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
+ if (
hash( $hash_function, $_REQUEST['timestamp'].yourls_auth_signature( $valid_user ) ) === $_REQUEST['signature']
or
hash( $hash_function, yourls_auth_signature( $valid_user ).$_REQUEST['timestamp'] ) === $_REQUEST['signature']
- ) {
- yourls_set_user( $valid_user );
- return true;
- }
- }
+ ) {
+ yourls_set_user( $valid_user );
+ return true;
+ }
+ }
// Signature doesn't match known user
- return false;
+ return false;
}
/**
@@ -407,17 +407,17 @@ function yourls_check_signature() {
if( !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] ) )
return false;
- // Check signature against all possible users
+ // Check signature against all possible users
global $yourls_user_passwords;
- foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
- if ( yourls_auth_signature( $valid_user ) === $_REQUEST['signature'] ) {
- yourls_set_user( $valid_user );
- return true;
- }
- }
+ foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
+ if ( yourls_auth_signature( $valid_user ) === $_REQUEST['signature'] ) {
+ yourls_set_user( $valid_user );
+ return true;
+ }
+ }
// Signature doesn't match known user
- return false;
+ return false;
}
/**
@@ -427,10 +427,10 @@ function yourls_check_signature() {
* @return string Signature
*/
function yourls_auth_signature( $username = false ) {
- if( !$username && defined('YOURLS_USER') ) {
- $username = YOURLS_USER;
- }
- return ( $username ? substr( yourls_salt( $username ), 0, 10 ) : 'Cannot generate auth signature: no username' );
+ if( !$username && defined('YOURLS_USER') ) {
+ $username = YOURLS_USER;
+ }
+ return ( $username ? substr( yourls_salt( $username ), 0, 10 ) : 'Cannot generate auth signature: no username' );
}
/**
@@ -440,9 +440,9 @@ function yourls_auth_signature( $username = false ) {
* @return bool True if timestamp is valid
*/
function yourls_check_timestamp( $time ) {
- $now = time();
- // Allow timestamp to be a little in the future or the past -- see Issue 766
- return yourls_apply_filter( 'check_timestamp', abs( $now - (int)$time ) < yourls_get_nonce_life(), $time );
+ $now = time();
+ // Allow timestamp to be a little in the future or the past -- see Issue 766
+ return yourls_apply_filter( 'check_timestamp', abs( $now - (int)$time ) < yourls_get_nonce_life(), $time );
}
/**
@@ -454,30 +454,30 @@ function yourls_check_timestamp( $time ) {
function yourls_store_cookie( $user = '' ) {
// No user will delete the cookie with a cookie time from the past
- if( !$user ) {
- $time = time() - 3600;
- } else {
- $time = time() + yourls_get_cookie_life();
- }
+ if( !$user ) {
+ $time = time() - 3600;
+ } else {
+ $time = time() + yourls_get_cookie_life();
+ }
$path = yourls_apply_filter( 'setcookie_path', '/' );
- $domain = yourls_apply_filter( 'setcookie_domain', parse_url( yourls_get_yourls_site(), PHP_URL_HOST ) );
- $secure = yourls_apply_filter( 'setcookie_secure', yourls_is_ssl() );
- $httponly = yourls_apply_filter( 'setcookie_httponly', true );
+ $domain = yourls_apply_filter( 'setcookie_domain', parse_url( yourls_get_yourls_site(), PHP_URL_HOST ) );
+ $secure = yourls_apply_filter( 'setcookie_secure', yourls_is_ssl() );
+ $httponly = yourls_apply_filter( 'setcookie_httponly', true );
- // Some browsers refuse to store localhost cookie
- if ( $domain == 'localhost' )
- $domain = '';
+ // Some browsers refuse to store localhost cookie
+ if ( $domain == 'localhost' )
+ $domain = '';
- yourls_do_action( 'pre_setcookie', $user, $time, $path, $domain, $secure, $httponly );
+ yourls_do_action( 'pre_setcookie', $user, $time, $path, $domain, $secure, $httponly );
if ( !headers_sent( $filename, $linenum ) ) {
yourls_setcookie( yourls_cookie_name(), yourls_cookie_value( $user ), $time, $path, $domain, $secure, $httponly );
- } else {
- // For some reason cookies were not stored: action to be able to debug that
- yourls_do_action( 'setcookie_failed', $user );
+ } else {
+ // For some reason cookies were not stored: action to be able to debug that
+ yourls_do_action( 'setcookie_failed', $user );
yourls_debug_log( "Could not store cookie: headers already sent in $filename on line $linenum" );
- }
+ }
}
/**
@@ -517,8 +517,8 @@ function yourls_setcookie($name, $value, $expire, $path, $domain, $secure, $http
* @return void
*/
function yourls_set_user( $user ) {
- if( !defined( 'YOURLS_USER' ) )
- define( 'YOURLS_USER', $user );
+ if( !defined( 'YOURLS_USER' ) )
+ define( 'YOURLS_USER', $user );
}
/**
@@ -532,7 +532,7 @@ function yourls_set_user( $user ) {
* @return integer cookie life span, in seconds
*/
function yourls_get_cookie_life() {
- return yourls_apply_filter( 'get_cookie_life', YOURLS_COOKIE_LIFE );
+ return yourls_apply_filter( 'get_cookie_life', YOURLS_COOKIE_LIFE );
}
/**
@@ -547,7 +547,7 @@ function yourls_get_cookie_life() {
* @return integer nonce life span, in seconds
*/
function yourls_get_nonce_life() {
- return yourls_apply_filter( 'get_nonce_life', YOURLS_NONCE_LIFE );
+ return yourls_apply_filter( 'get_nonce_life', YOURLS_NONCE_LIFE );
}
/**
@@ -572,7 +572,7 @@ function yourls_cookie_name() {
* @return string cookie value
*/
function yourls_cookie_value( $user ) {
- return yourls_apply_filter( 'set_cookie_value', yourls_salt( $user ?? '' ), $user );
+ return yourls_apply_filter( 'set_cookie_value', yourls_salt( $user ?? '' ), $user );
}
/**
@@ -583,7 +583,7 @@ function yourls_cookie_value( $user ) {
* @return float
*/
function yourls_tick() {
- return ceil( time() / yourls_get_nonce_life() );
+ return ceil( time() / yourls_get_nonce_life() );
}
/**
@@ -596,8 +596,8 @@ function yourls_tick() {
* @return string hashed string
*/
function yourls_salt( $string ) {
- $salt = defined('YOURLS_COOKIEKEY') ? YOURLS_COOKIEKEY : md5(__FILE__) ;
- return yourls_apply_filter( 'yourls_salt', hash_hmac( yourls_hmac_algo(), $string, $salt), $string );
+ $salt = defined('YOURLS_COOKIEKEY') ? YOURLS_COOKIEKEY : md5(__FILE__) ;
+ return yourls_apply_filter( 'yourls_salt', hash_hmac( yourls_hmac_algo(), $string, $salt), $string );
}
/**
@@ -622,13 +622,13 @@ function yourls_hmac_algo() {
* @return string Nonce token
*/
function yourls_create_nonce($action, $user = false ) {
- if( false === $user ) {
+ if( false === $user ) {
$user = defined('YOURLS_USER') ? YOURLS_USER : '-1';
}
- $tick = yourls_tick();
- $nonce = substr( yourls_salt($tick . $action . $user), 0, 10 );
- // Allow plugins to alter the nonce
- return yourls_apply_filter( 'create_nonce', $nonce, $action, $user );
+ $tick = yourls_tick();
+ $nonce = substr( yourls_salt($tick . $action . $user), 0, 10 );
+ // Allow plugins to alter the nonce
+ return yourls_apply_filter( 'create_nonce', $nonce, $action, $user );
}
/**
@@ -641,10 +641,10 @@ function yourls_create_nonce($action, $user = false ) {
* @return string Nonce field
*/
function yourls_nonce_field($action, $name = 'nonce', $user = false, $echo = true ) {
- $field = '<?php echo $title ?>
- <?php echo $title ?>
+
-
-
-
- ';
- echo join( "\n", yourls_get_debug_log() );
- echo ' ';
- } ?>
-
-
-
-
+
+
+ ';
+ echo join( "\n", yourls_get_debug_log() );
+ echo ' ';
+ } ?>
+
+ ; ?>/images/yourls-logo.svg?v=<?php echo YOURLS_VERSION; ?> "YOURLS")
-