mirror of
https://github.com/Chouchen/shorturl.git
synced 2018-06-07 06:34:38 +02:00
Folder bug correction + logging improved + messages from class
This commit is contained in:
parent
66d7a87e63
commit
40bb913551
45
short.php
45
short.php
@ -10,32 +10,35 @@ $newURL = $_POST['url'];
|
||||
|
||||
$log->message('entering '.$newname.' as '.$newURL);
|
||||
|
||||
$URI = $_SERVER['REQUEST_URI'];
|
||||
$folders = explode('/', $URI);
|
||||
if(count($folders) > 2){
|
||||
$folder = '/'.$folders[1].'/';
|
||||
}else
|
||||
$folder = '/';
|
||||
$log->message('folder : '.$folder);
|
||||
|
||||
$_SESSION['msg'] = '';
|
||||
if($newname =='' || $newURL==''){
|
||||
$_SESSION['msg'] .= ShortURL::STATE_FIELD_MISSING;
|
||||
}
|
||||
$log->error(ShortURL::STATE_FIELD_MISSING);
|
||||
}else{
|
||||
|
||||
$ret = $url->shortThisUrl($newURL, $newname);
|
||||
$ret = $url->shortThisUrl($newURL, $newname);
|
||||
|
||||
if(is_bool($ret) && !$ret){
|
||||
$_SESSION['msg'] .= ShortURL::STATE_ERROR;
|
||||
}
|
||||
elseif($ret === ShortURL::STATE_ALREADY_EXIST){
|
||||
$_SESSION['msg'] .= $ret;
|
||||
}
|
||||
else{
|
||||
$URI = $_SERVER['REQUEST_URI'];
|
||||
$folders = explode('/', $URI);
|
||||
if(count($folders) > 2){
|
||||
$folder = '/'.$folders[1].'/';
|
||||
}else
|
||||
$folder = '/';
|
||||
if(is_bool($ret) && !$ret){
|
||||
$log->error(ShortURL::STATE_FIELD_MISSING);
|
||||
$_SESSION['msg'] .= ShortURL::STATE_FIELD_MISSING;
|
||||
}
|
||||
elseif($ret === ShortURL::STATE_ALREADY_EXIST){
|
||||
$log->error(ShortURL::STATE_ALREADY_EXIST);
|
||||
$_SESSION['msg'] .= $ret;
|
||||
}
|
||||
else{
|
||||
$_SESSION['msg'] .= ShortURL::STATE_CREATED.': <a href="http://'.$_SERVER['SERVER_NAME'].$folder.rawurlencode($newname).'">http://'.$_SERVER['SERVER_NAME'].$folder.rawurlencode($newname).'</a>';
|
||||
|
||||
$log->message('folder : '.$folder);
|
||||
|
||||
$_SESSION['msg'] .= 'Raccourci créé : <a href="http://'.$_SERVER['SERVER_NAME'].$folder.rawurlencode($newname).'">http://'.$_SERVER['SERVER_NAME'].$folder.rawurlencode($newname).'</a>';
|
||||
|
||||
$log->message('that makes the link : http://'.$_SERVER['SERVER_NAME'].$folder.rawurlencode($newname).'"');
|
||||
$log->message('that makes the link : http://'.$_SERVER['SERVER_NAME'].$folder.rawurlencode($newname).'"');
|
||||
}
|
||||
}
|
||||
|
||||
$log->message('Redirecting to '.$folder);
|
||||
header('Location: '.$folder);
|
||||
|
Loading…
Reference in New Issue
Block a user