Mirror/codiad
1
0
Fork 0
mirror of https://github.com/xevidos/codiad.git synced 2024-09-21 10:21:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added exits instead of echo returns.

Browse Source
This commit is contained in:
xevidos 2019-02-13 13:42:43 -05:00
parent b4f42db8fa
commit 53026ba69e
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/user/class.user.php
View File

@ -167,10 +167,13 @@ class User {
public function Authenticate() {
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
if( $this->username == "" || $this->password == "" ) {
echo( formatJSEND( "error", "Username or password can not be blank." ) );
return;
exit( formatJSEND( "error", "Username or password can not be blank." ) );
}
if( ! is_dir( SESSIONS_PATH ) ) {
@ -194,8 +197,7 @@ class User {
chown( SESSIONS_PATH, $server_user );
} catch( Exception $e ) {
echo( formatJSEND("error", "Error, incorrect owner of sessions folder. Expecting: $server_user, Recieved: " . $sessions_owner ) );
return;
exit( formatJSEND("error", "Error, incorrect owner of sessions folder. Expecting: $server_user, Recieved: " . $sessions_owner ) );
}
}
@ -206,8 +208,7 @@ class User {
chmod( SESSIONS_PATH, 00755 );
} catch( Exception $e ) {
echo( formatJSEND("error", "Error, incorrect permissions on sessions folder. Expecting: 0755, Recieved: " . $sessions_permissions ) );
return;
exit( formatJSEND("error", "Error, incorrect permissions on sessions folder. Expecting: 0755, Recieved: " . $sessions_permissions ) );
}
}

21
components/user/init.js
View File

@ -71,11 +71,22 @@
//////////////////////////////////////////////////////////////////
authenticate: function() {
$.post(this.controller + '?action=authenticate', this.loginForm.serialize(), function(data) {
parsed = codiad.jsend.parse(data);
if(parsed != 'error') {
// Session set, reload
window.location.reload();
$.ajax({
type: "POST",
url: this.controller + '?action=authenticate',
data: this.loginForm.serialize(),
success: function( data ) {
parsed = codiad.jsend.parse(data);
if( parsed != 'error' ) {
// Session set, reload
window.location.reload();
}
},
error: function( XMLHttpRequest, textStatus, errorThrown ) {
console.log( XMLHttpRequest, textStatus, errorThrown );
}
});
},