From 315ac339869864fceb640f97f60afbd33079561b Mon Sep 17 00:00:00 2001 From: ozhozh Date: Tue, 15 Jun 2010 06:30:09 +0000 Subject: [PATCH] More actions in loader. Fixes issue 367. Removed test for windows, as Apache will 403 sooner than YOURLS anyway git-svn-id: http://yourls.googlecode.com/svn/trunk@400 12232710-3e20-11de-b438-597f59cd7555 --- yourls-loader.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/yourls-loader.php b/yourls-loader.php index 040f280..1e39f4e 100644 --- a/yourls-loader.php +++ b/yourls-loader.php @@ -25,6 +25,8 @@ // Redirection: if( preg_match( "@^([$pattern]+)/?$@", $request, $matches ) ) { $keyword = isset( $matches[1] ) ? $matches[1] : ''; + $keyword = yourls_sanitize_keyword( $keyword ); + yourls_do_action( 'load_template_go', $keyword ); include( YOURLS_ABSPATH.'/yourls-go.php' ); exit; } @@ -32,14 +34,17 @@ // Stats: if( preg_match( "@^([$pattern]+)\+(all)?/?$@", $request, $matches ) ) { $keyword = isset( $matches[1] ) ? $matches[1] : ''; + $keyword = yourls_sanitize_keyword( $keyword ); $aggregate = isset( $matches[2] ) ? (bool)$matches[2] && yourls_allow_duplicate_longurls() : false; + yourls_do_action( 'load_template_infos', $keyword ); include( YOURLS_ABSPATH.'/yourls-infos.php' ); exit; } -// Bookmarklet (doesn't work on Windows) -if( strtoupper(substr(PHP_OS, 0, 3)) != 'WIN' && preg_match( "@^[a-zA-Z]+://.+@", $request, $matches ) ) { - $url = $matches[0]; +// Prefix-n-Shorten sends to bookmarklet (doesn't work on Windows) +if( preg_match( "@^[a-zA-Z]+://.+@", $request, $matches ) ) { + $url = yourls_sanitize_url( $matches[0] ); + yourls_do_action( 'load_template_redirect_admin', $url ); yourls_redirect( yourls_admin_url('index.php').'?u='.rawurlencode( $url ) ); exit; } -- 2.45.0