diff options
author | raimund-schluessler <raimund.schluessler@googlemail.com> | 2014-07-30 23:03:54 +0400 |
---|---|---|
committer | raimund-schluessler <raimund.schluessler@googlemail.com> | 2014-07-30 23:03:54 +0400 |
commit | 1093619ba66c4cf73e0eef649c04fdd4f6119b1a (patch) | |
tree | 9c806d1ec0d8e1c58581f0b5deda5b4808b16f66 /lib | |
parent | f5d3863c925a9ae156fe853855f74289ba89294b (diff) |
Rename to Tasks, closes #51
Diffstat (limited to 'lib')
-rw-r--r-- | lib/controller.php | 2 | ||||
-rw-r--r-- | lib/controller/collectionscontroller.php | 14 | ||||
-rw-r--r-- | lib/controller/listscontroller.php | 4 | ||||
-rw-r--r-- | lib/controller/pagecontroller.php | 36 | ||||
-rw-r--r-- | lib/controller/settingscontroller.php | 10 | ||||
-rw-r--r-- | lib/controller/taskscontroller.php | 8 | ||||
-rw-r--r-- | lib/dispatcher.php | 14 | ||||
-rw-r--r-- | lib/helper.php | 12 |
8 files changed, 50 insertions, 50 deletions
diff --git a/lib/controller.php b/lib/controller.php index 27d62b9e..067d61dc 100644 --- a/lib/controller.php +++ b/lib/controller.php @@ -9,7 +9,7 @@ * See the COPYING-README file. */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; use OCP\AppFramework\IAppContainer, OCP\AppFramework\Controller as BaseController, diff --git a/lib/controller/collectionscontroller.php b/lib/controller/collectionscontroller.php index 9eeb0608..984cb5bb 100644 --- a/lib/controller/collectionscontroller.php +++ b/lib/controller/collectionscontroller.php @@ -21,9 +21,9 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\JSONResponse; class CollectionsController extends Controller { @@ -32,7 +32,7 @@ class CollectionsController extends Controller { * @NoAdminRequired */ public function getCollections(){ - $l = \OCP\Util::getL10N('tasks_enhanced'); + $l = \OCP\Util::getL10N('tasks'); $collections = array( array( 'id' => "starred", @@ -61,14 +61,14 @@ class CollectionsController extends Controller { ); foreach ($collections as $key => $collection){ try{ - $tmp = \OCP\Config::getUserValue($this->api->getUserId(), 'tasks_enhanced','show_'.$collection['id']); + $tmp = \OCP\Config::getUserValue($this->api->getUserId(), 'tasks','show_'.$collection['id']); if (!in_array((int)$tmp, array(0,1,2)) || $tmp === null) { $tmp = 2; - \OCP\Config::setUserValue($this->api->getUserId(), 'tasks_enhanced','show_'.$collection['id'],$tmp); + \OCP\Config::setUserValue($this->api->getUserId(), 'tasks','show_'.$collection['id'],$tmp); } $collections[$key]['show'] = (int)$tmp; }catch(\Exception $e) { - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } $result = array( @@ -88,7 +88,7 @@ class CollectionsController extends Controller { $collectionId = (string) $this->params('collectionID'); $vis = (int) $this->params('visibility'); if (in_array($vis, array(0,1,2))){ - \OCP\Config::setUserValue($this->api->getUserId(), 'tasks_enhanced','show_'.$collectionId,$vis); + \OCP\Config::setUserValue($this->api->getUserId(), 'tasks','show_'.$collectionId,$vis); } $response = new JSONResponse(); return $response; diff --git a/lib/controller/listscontroller.php b/lib/controller/listscontroller.php index cfe12e49..870171ae 100644 --- a/lib/controller/listscontroller.php +++ b/lib/controller/listscontroller.php @@ -21,9 +21,9 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\JSONResponse; class ListsController extends Controller { diff --git a/lib/controller/pagecontroller.php b/lib/controller/pagecontroller.php index 294316cd..54419304 100644 --- a/lib/controller/pagecontroller.php +++ b/lib/controller/pagecontroller.php @@ -8,9 +8,9 @@ * See the COPYING-README file. */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\TemplateResponse; @@ -25,30 +25,30 @@ class PageController extends Controller { */ public function index() { if (defined('DEBUG') && DEBUG) { - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-route'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-animate'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/momentjs/moment'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-route'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-animate'); + \OCP\Util::addScript('tasks', 'vendor/momentjs/moment'); + \OCP\Util::addScript('tasks', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0'); } else { - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-route.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/angularjs/angular-animate.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/momentjs/moment.min'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular.min'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-route.min'); + \OCP\Util::addScript('tasks', 'vendor/angularjs/angular-animate.min'); + \OCP\Util::addScript('tasks', 'vendor/momentjs/moment.min'); + \OCP\Util::addScript('tasks', 'vendor/bootstrap/ui-bootstrap-custom-tpls-0.10.0.min'); } - \OCP\Util::addScript('tasks_enhanced', 'public/app'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/appframework/app'); - \OCP\Util::addScript('tasks_enhanced', 'vendor/timepicker/jquery.ui.timepicker'); - \OCP\Util::addStyle('tasks_enhanced', 'style'); - \OCP\Util::addStyle('tasks_enhanced', 'vendor/bootstrap/bootstrap'); + \OCP\Util::addScript('tasks', 'public/app'); + \OCP\Util::addScript('tasks', 'vendor/appframework/app'); + \OCP\Util::addScript('tasks', 'vendor/timepicker/jquery.ui.timepicker'); + \OCP\Util::addStyle('tasks', 'style'); + \OCP\Util::addStyle('tasks', 'vendor/bootstrap/bootstrap'); $date = new \DateTimeZone(\OC_Calendar_App::getTimezone()); $day = new \DateTime('today', $date); $day = $day->format('d'); // TODO: Make a HTMLTemplateResponse class - $response = new TemplateResponse('tasks_enhanced', 'main'); + $response = new TemplateResponse('tasks', 'main'); $response->setParams(array( 'DOM' => $day )); diff --git a/lib/controller/settingscontroller.php b/lib/controller/settingscontroller.php index d02d0e2a..9a002ff4 100644 --- a/lib/controller/settingscontroller.php +++ b/lib/controller/settingscontroller.php @@ -21,9 +21,9 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, +use OCA\Tasks\Controller, OCP\AppFramework\Http\JSONResponse; class SettingsController extends Controller { @@ -35,8 +35,8 @@ class SettingsController extends Controller { $settings = array( array( 'id' => 'various', - 'showHidden' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks_enhanced','various_showHidden'), - 'startOfWeek' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks_enhanced','various_startOfWeek'), + 'showHidden' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks','various_showHidden'), + 'startOfWeek' => (int)\OCP\Config::getUserValue($this->api->getUserId(), 'tasks','various_startOfWeek'), 'userID' => $this->api->getUserId() ) @@ -55,7 +55,7 @@ class SettingsController extends Controller { * @NoAdminRequired */ public function set(){ - \OCP\Config::setUserValue($this->api->getUserId(), 'tasks_enhanced',$this->params('type').'_'.$this->params('setting'), $this->params('value')); + \OCP\Config::setUserValue($this->api->getUserId(), 'tasks',$this->params('type').'_'.$this->params('setting'), $this->params('value')); $response = new JSONResponse(); $response->setData(); return $response; diff --git a/lib/controller/taskscontroller.php b/lib/controller/taskscontroller.php index e18f7811..2f9673ab 100644 --- a/lib/controller/taskscontroller.php +++ b/lib/controller/taskscontroller.php @@ -21,10 +21,10 @@ * */ -namespace OCA\Tasks_enhanced\Controller; +namespace OCA\Tasks\Controller; -use OCA\Tasks_enhanced\Controller, - OCA\Tasks_enhanced\Helper, +use OCA\Tasks\Controller, + OCA\Tasks\Helper, OCP\AppFramework\Http\JSONResponse; class TasksController extends Controller { @@ -54,7 +54,7 @@ class TasksController extends Controller { $task_data['calendarcolor'] = $calendar['calendarcolor']; $tasks[] = $task_data; } catch(\Exception $e) { - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } } diff --git a/lib/dispatcher.php b/lib/dispatcher.php index 545cf865..d2c4cdfe 100644 --- a/lib/dispatcher.php +++ b/lib/dispatcher.php @@ -8,15 +8,15 @@ * See the COPYING-README file. */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; use OCP\AppFramework\App as MainApp, OCP\AppFramework\IAppContainer, - OCA\Tasks_enhanced\Controller\PageController, - OCA\Tasks_enhanced\Controller\CollectionsController, - OCA\Tasks_enhanced\Controller\ListsController, - OCA\Tasks_enhanced\Controller\TasksController, - OCA\Tasks_enhanced\Controller\SettingsController; + OCA\Tasks\Controller\PageController, + OCA\Tasks\Controller\CollectionsController, + OCA\Tasks\Controller\ListsController, + OCA\Tasks\Controller\TasksController, + OCA\Tasks\Controller\SettingsController; /** * This class manages our app actions @@ -31,7 +31,7 @@ class Dispatcher extends MainApp { protected $app; public function __construct($params) { - parent::__construct('tasks_enhanced', $params); + parent::__construct('tasks', $params); $this->container = $this->getContainer(); $this->registerServices(); } diff --git a/lib/helper.php b/lib/helper.php index c3b43cef..c7a721fd 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -20,10 +20,10 @@ * */ -namespace OCA\Tasks_enhanced; +namespace OCA\Tasks; use Sabre\VObject; -// use OCA\Tasks_enhanced\App; +// use OCA\Tasks\App; Class helper { @@ -48,7 +48,7 @@ Class helper { $task['start'] = $start->format('Ymd\THis'); } catch(\Exception $e) { $task['start'] = null; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['start'] = null; @@ -61,7 +61,7 @@ Class helper { $task['due'] = $due->format('Ymd\THis'); } catch(\Exception $e) { $task['due'] = null; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['due'] = null; @@ -143,7 +143,7 @@ Class helper { } catch(\Exception $e) { $task['reminder'] = null; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['reminder'] = null; @@ -163,7 +163,7 @@ Class helper { $task['completed'] = true; } catch(\Exception $e) { $task['completed'] = false; - \OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR); + \OCP\Util::writeLog('tasks', $e->getMessage(), \OCP\Util::ERROR); } } else { $task['completed'] = false; |