diff --git a/README.md b/README.md index f745eb0..dac633f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Tim's Todo -[![Build Status](https://travis-ci.org/timw4mail/tims-todo.svg?branch=master)](https://travis-ci.org/timw4mail/tims-todo) +[![Build Status](https://jenkins.timshomepage.net/buildStatus/icon?job=todo)](https://jenkins.timshomepage.net/job/todo/) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/timw4mail/tims-todo/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/timw4mail/tims-todo/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/timw4mail/tims-todo/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/timw4mail/tims-todo/?branch=master) \ No newline at end of file diff --git a/application/libraries/Todo.php b/application/libraries/Todo.php index 8fa2684..da8216d 100755 --- a/application/libraries/Todo.php +++ b/application/libraries/Todo.php @@ -175,8 +175,6 @@ class Todo { //Get the current user's primary group $group_id = $this->get_user_group(); - //print_r($group_id); - $this->CI->db->set('title', $title) ->set('description', $desc) ->set('group_id', $group_id); @@ -191,8 +189,6 @@ class Todo { show_error('This category already exists!'); return false; } - - } // -------------------------------------------------------------------------- @@ -322,14 +318,14 @@ class Todo { ->from('user') ->where('id', $user) ->get(); - + $row = $user_check->row(); - + if ( ! password_verify($old_pass, $row->password)) { $err[] = "Wrong password"; } - + $res = (empty($err)) ? true : $err; if($res == TRUE) @@ -789,7 +785,7 @@ class Todo { public function get_friend_requests() { static $requests = NULL; - + if (is_null($requests)) { //Get friend requests for the current user diff --git a/application/models/task_model.php b/application/models/task_model.php index d34efb5..a7d2faf 100755 --- a/application/models/task_model.php +++ b/application/models/task_model.php @@ -531,12 +531,6 @@ class Task_model extends CI_Model { $status = ($this->input->post('status') == FALSE) ? 1 : $this->input->post('status'); $created = time(); - /*$title = $this->title; - $desc = $this->description; - $category = $this->category; - $priority = $this->priority; - $status = $this->status; - $created = $this->created;*/ $due = $this->due; $uid = $this->user_id; diff --git a/build.xml b/build.xml index 45f5bc2..af93ff1 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ - + - - + --> diff --git a/phpci.yml b/phpci.yml deleted file mode 100755 index 25bcad9..0000000 --- a/phpci.yml +++ /dev/null @@ -1,30 +0,0 @@ -build_settings: - verbose: true - ignore: - - "application/third_party" - - "web" - - "system" - - "third_party" - - "tests" - - "vendor" - - "migrations" - -setup: - composer: - action: "install" - env: - APPLICATION_ENV: "development" -# shell: -# - "cd %BUILD_PATH% && vendor/bin/phinx migrate -e testing" - -test: - php_unit: - config: 'tests/phpunit.xml' - run_from: 'tests' - php_mess_detector: - allowed_warnings: 10 - rules: - - "unusedcode" - - "naming" -# php_docblock_checker: -# php_loc: