diff --git a/.gitignore b/.gitignore index 93c4797..518f969 100755 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ user_guide_src/cilexer/pycilexer.egg-info/* /tests/tests/ /tests/results/ /resources +/.env diff --git a/application/config/autoload.php b/application/config/autoload.php index 7cdc901..d20f488 100755 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -58,7 +58,7 @@ $autoload['packages'] = array(); | | $autoload['libraries'] = array('user_agent' => 'ua'); */ -$autoload['libraries'] = array(); +$autoload['libraries'] = array('database', 'session'); /* | ------------------------------------------------------------------- diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 4af4152..2016b03 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -19,12 +19,18 @@ class MY_Controller extends CI_Controller { private function handle() { - + $this->environment(); } function clean_input( $post ) { - return str_replace( 'null', '', $this->db->escape_str( $this->input->post( $post ), TRUE ) ); + $value = $this->input->post( $post ); + +// $escapedValue = $this->db->escape_string( $value, TRUE ); + + $denulledValue = str_replace( 'null', '', $value); + + return $denulledValue; } public function json($data) diff --git a/application/views/pages/login/login_view.php b/application/views/pages/login/login_view.php index 354d951..da009b3 100644 --- a/application/views/pages/login/login_view.php +++ b/application/views/pages/login/login_view.php @@ -34,25 +34,28 @@ -
> +load->view('specials/notifyme_modal'); ?> +
-
+
...

projectbeheer

-
+
- +
- +
- - + +
@@ -102,5 +105,9 @@ + + + + diff --git a/application/views/specials/notifyme_modal.php b/application/views/specials/notifyme_modal.php new file mode 100644 index 0000000..33c8c35 --- /dev/null +++ b/application/views/specials/notifyme_modal.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/composer.json b/composer.json index 30630e2..ac9671c 100755 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ "source": "https://github.com/bcit-ci/CodeIgniter" }, "require": { - "php": ">=5.3.7" + "php": ">=5.3.7", + "vlucas/phpdotenv": "^2.4" }, "suggest": { "paragonie/random_compat": "Provides better randomness in PHP 5.x" diff --git a/public/index.php b/public/index.php index 82920d1..dcb94ad 100755 --- a/public/index.php +++ b/public/index.php @@ -1,4 +1,18 @@ load(); + + + /** * CodeIgniter * diff --git a/public/js/lib/modules/login/loginModule.js b/public/js/lib/modules/login/loginModule.js index 2fa702b..4086741 100644 --- a/public/js/lib/modules/login/loginModule.js +++ b/public/js/lib/modules/login/loginModule.js @@ -4,42 +4,42 @@ * Date: 05/12/2017 * Time: 11:17 */ -var pp = {}; +var dbo = {}; + $( function () { - pp.loginModel = { + dbo.loginModel = { username: ko.observable( '' ), password: ko.observable( '' ), login: function () { - pp.loginService.login(); + dbo.loginService.login(); } } - - ko.applyBindings( pp.loginModel, document.getElementById( "login-user" ) ); - +console.log( 'text' ); + ko.applyBindings( dbo.loginModel, document.getElementById( "login-form" ) ); } ); -pp.loginService = { +dbo.loginService = { login: function () { - var ds = pp.loginDataservice; - var self = pp.loginService; - var vm = pp.loginModel; + var ds = dbo.loginDataservice; + var self = dbo.loginService; + var vm = dbo.loginModel; - self.validateInput( function ( data ) { - if ( !data ) return self.notifyWrongPassword(); + self.validateInput( function ( submitDATA ) { + if ( ! submitDATA ) return self.notifyWrongPassword(); ds.login( submitDATA, function ( data ) { - if ( data ) return location.reload(); +// if ( data ) return location.reload(); } ); } ); }, validateInput: function ( callback ) { - var vm = pp.loginModel; + var vm = dbo.loginModel; if ( vm.username().length < 2 ) return callback( false ); if ( vm.password().length < 6 ) return callback( false ); @@ -55,14 +55,13 @@ pp.loginService = { notifyWrongPassword: function () { notifyMe( { title : 'Login fout', - message: 'Gebruikersnaam / wachtwoord komen niet overeen', - alert : true + message: 'Gebruikersnaam / wachtwoord komen niet overeen' } ); } }; -pp.loginDataservice = { +dbo.loginDataservice = { login: function ( submitDATA, callback ) { $.post( 'index.php/login/', submitDATA, function ( data ) { diff --git a/public/js/lib/modules/specials/notifyModule.js b/public/js/lib/modules/specials/notifyModule.js index 8ef53f0..7708a47 100644 --- a/public/js/lib/modules/specials/notifyModule.js +++ b/public/js/lib/modules/specials/notifyModule.js @@ -6,10 +6,10 @@ */ var notifyMe = function ( options, callback ) { - pp.notifyModel.init( options, callback ); + dbo.notifyModel.init( options, callback ); } -pp.notifyModel = { +dbo.notifyModel = { title : ko.observable( null ), message : ko.observable( null ), @@ -21,7 +21,7 @@ pp.notifyModel = { callback : null, init: function ( options, callback ) { - var vm = pp.notifyModel; + var vm = dbo.notifyModel; vm.callback = callback; @@ -31,36 +31,35 @@ pp.notifyModel = { }, setOptions: function ( options ) { - var vm = pp.notifyModel; + var vm = dbo.notifyModel; vm.title( options.title || '' ); vm.message( options.message || '' ); - vm.notify( options.notify || false ); - vm.alert( options.alert || false ); + vm.notify( options.notify || true ); vm.noText( options.noText || 'Nee' ); vm.yesText( options.yesText || 'Ja' ); vm.closeText( options.closeText || 'ok' ); }, closeNo: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback( false ); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback( false ); }, closeYes: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback( true ); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback( true ); }, closeOk: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback(); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback(); }, close: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback(); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback(); } } -ko.applyBindings( pp.notifyModel, document.getElementById( "notify-me" ) ); +ko.applyBindings( dbo.notifyModel, document.getElementById( "notify-me" ) );