You know the drill, Updates

This commit is contained in:
2023-05-01 19:51:20 -07:00
parent af6f76fbcb
commit 006e3d3314
105 changed files with 1725 additions and 1430 deletions

View File

@ -18,13 +18,13 @@ switch( $action ) {
case 'add':
yourls_verify_nonce( 'add_url', $_REQUEST['nonce'], false, 'omg error' );
$return = yourls_add_new_link( $_REQUEST['url'], $_REQUEST['keyword'] );
$return = yourls_add_new_link( $_REQUEST['url'], $_REQUEST['keyword'], '', $_REQUEST['rowid'] );
echo json_encode($return);
break;
case 'edit_display':
yourls_verify_nonce( 'edit-link_'.$_REQUEST['id'], $_REQUEST['nonce'], false, 'omg error' );
$row = yourls_table_edit_row ( $_REQUEST['keyword'] );
$row = yourls_table_edit_row ( $_REQUEST['keyword'], $_REQUEST['id'] );
echo json_encode( array('html' => $row) );
break;

View File

@ -110,10 +110,10 @@ if ( isset( $_GET['u'] ) or isset( $_GET['up'] ) ) {
// No sanitization needed here: everything happens in yourls_add_new_link()
if( isset( $_GET['u'] ) ) {
// Old school bookmarklet: ?u=<url>
$url = urldecode( $_GET['u'] );
$url = $_GET['u'];
} else {
// New style bookmarklet: ?up=<url protocol>&us=<url slashes>&ur=<url rest>
$url = urldecode( $_GET['up'] . $_GET['us'] . $_GET['ur'] );
$url = $_GET['up'] . $_GET['us'] . $_GET['ur'];
}
$keyword = ( isset( $_GET['k'] ) ? ( $_GET['k'] ) : '' );
$title = ( isset( $_GET['t'] ) ? ( $_GET['t'] ) : '' );
@ -227,7 +227,7 @@ if ( isset( $_GET['u'] ) or isset( $_GET['up'] ) ) {
$display_on_page = ( $offset + 1 );
}
// Determing Total Amount Of Pages
// Determine Total Amount Of Pages
$total_pages = ceil( $total_items / $perpage );
}
@ -292,7 +292,7 @@ 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()->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;

View File

@ -47,7 +47,7 @@ if( isset( $_GET['action'] ) ) {
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' );

View File

@ -98,7 +98,7 @@ STANDARD_SIMPLE;
if (r.short_url) {
prompt(r.message, r.short_url);
} else {
alert('An error occured: ' + r.message);
alert('An error occurred: ' + r.message);
}
};
sc.src = '$base_bookmarklet' + p + '&jsonp=yourls';
@ -166,7 +166,7 @@ CUSTOM_STANDARD;
if (r.short_url) {
prompt(r.message, r.short_url);
} else {
alert('An error occured: ' + r.message);
alert('An error occurred: ' + r.message);
}
};
sc.src = '$base_bookmarklet' + p + '&k=' + k + '&jsonp=yourls';
@ -247,7 +247,7 @@ TWITTER;
?>
<?php $js_code = <<<TUMBLR
// Share on Tumlr
// Share on Tumblr
var d = document,
w = window,
enc = encodeURIComponent,