From d8a2a3a8923e545526353eb4ac97d55990d84f2c Mon Sep 17 00:00:00 2001 From: Gary Herman Date: Fri, 30 Aug 2013 16:53:27 -0700 Subject: [PATCH 1/2] Fixed bugs when setting up in which facebook config was loading before crud causing facebook config errors to be hidden. Fixed bug in naming of plugin Gearman, should be CakephpGearman. Add facebook.php file to Config dir with placeholder for appId and secret (users should enter their own appId and secret, but this at least allows the application to run). --- Config/Migration/1377801866_initial_schema.php | 0 Config/bootstrap.php | 6 +++--- Config/database.php.example | 0 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 Config/Migration/1377801866_initial_schema.php mode change 100644 => 100755 Config/database.php.example diff --git a/Config/Migration/1377801866_initial_schema.php b/Config/Migration/1377801866_initial_schema.php old mode 100644 new mode 100755 diff --git a/Config/bootstrap.php b/Config/bootstrap.php index 88066cb..8cde957 100755 --- a/Config/bootstrap.php +++ b/Config/bootstrap.php @@ -106,12 +106,10 @@ 'file' => 'error', )); -Configure::load('facebook'); - CakePlugin::load('Migrations'); CakePlugin::load('Crud'); CakePlugin::load('Elastic'); -CakePlugin::load('Gearman'); +CakePlugin::load('CakephpGearman'); if (php_sapi_name() !== 'cli' && Configure::read('debug')) { App::uses('CakeEventManager', 'Event'); @@ -122,3 +120,5 @@ $controller->Crud->addListener('DebugKit', 'Crud.DebugKit'); }, 'Controller.initialize'); } + +Configure::load('facebook'); \ No newline at end of file diff --git a/Config/database.php.example b/Config/database.php.example old mode 100644 new mode 100755 From 4b84289244a5a4281b9c8bfe88f2b7ea500e6480 Mon Sep 17 00:00:00 2001 From: Gary Herman Date: Fri, 30 Aug 2013 17:15:28 -0700 Subject: [PATCH 2/2] Added facebook.php to /Config directory - sample file with placeholders for appId and secret. App won't install and run without this. --- .gitignore | 2 +- .htaccess | 0 Config/facebook.php | 6 ++++++ Console/Command/PopulateShell.php | 0 Console/Command/SyncShell.php | 0 Console/Command/Task/ProgressBarTask.php | 0 Controller/CompaniesController.php | 0 Controller/Component/Auth/FacebookAuthenticate.php | 0 Controller/UsersController.php | 0 Event/EventCentral.php | 0 LICENSE | 0 Model/CompaniesUser.php | 0 Model/Company.php | 0 Model/User.php | 0 README.md | 0 Test/Case/Controller/CompaniesControllerTest.php | 0 Test/Case/Controller/UsersControllerTest.php | 0 Test/Case/Model/CompaniesUserTest.php | 0 Test/Case/Model/CompanyTest.php | 0 Test/Case/Model/UserTest.php | 0 Test/Fixture/CompaniesUserFixture.php | 0 Test/Fixture/CompanyFixture.php | 0 Test/Fixture/UserFixture.php | 0 View/Companies/add.ctp | 0 View/Companies/edit.ctp | 0 View/Companies/index.ctp | 0 View/Companies/map.ctp | 0 View/Companies/view.ctp | 0 View/Elements/facebook_init.ctp | 0 View/Users/add.ctp | 0 View/Users/edit.ctp | 0 View/Users/index.ctp | 0 View/Users/view.ctp | 0 composer.json | 0 composer.lock | 0 get_started.txt | 0 tmp/.keep | 0 webroot/js/jquery.min.js | 0 38 files changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .htaccess create mode 100755 Config/facebook.php mode change 100644 => 100755 Console/Command/PopulateShell.php mode change 100644 => 100755 Console/Command/SyncShell.php mode change 100644 => 100755 Console/Command/Task/ProgressBarTask.php mode change 100644 => 100755 Controller/CompaniesController.php mode change 100644 => 100755 Controller/Component/Auth/FacebookAuthenticate.php mode change 100644 => 100755 Controller/UsersController.php mode change 100644 => 100755 Event/EventCentral.php mode change 100644 => 100755 LICENSE mode change 100644 => 100755 Model/CompaniesUser.php mode change 100644 => 100755 Model/Company.php mode change 100644 => 100755 Model/User.php mode change 100644 => 100755 README.md mode change 100644 => 100755 Test/Case/Controller/CompaniesControllerTest.php mode change 100644 => 100755 Test/Case/Controller/UsersControllerTest.php mode change 100644 => 100755 Test/Case/Model/CompaniesUserTest.php mode change 100644 => 100755 Test/Case/Model/CompanyTest.php mode change 100644 => 100755 Test/Case/Model/UserTest.php mode change 100644 => 100755 Test/Fixture/CompaniesUserFixture.php mode change 100644 => 100755 Test/Fixture/CompanyFixture.php mode change 100644 => 100755 Test/Fixture/UserFixture.php mode change 100644 => 100755 View/Companies/add.ctp mode change 100644 => 100755 View/Companies/edit.ctp mode change 100644 => 100755 View/Companies/index.ctp mode change 100644 => 100755 View/Companies/map.ctp mode change 100644 => 100755 View/Companies/view.ctp mode change 100644 => 100755 View/Elements/facebook_init.ctp mode change 100644 => 100755 View/Users/add.ctp mode change 100644 => 100755 View/Users/edit.ctp mode change 100644 => 100755 View/Users/index.ctp mode change 100644 => 100755 View/Users/view.ctp mode change 100644 => 100755 composer.json mode change 100644 => 100755 composer.lock mode change 100644 => 100755 get_started.txt mode change 100644 => 100755 tmp/.keep mode change 100644 => 100755 webroot/js/jquery.min.js diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index a8de741..21501cd --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ Vendor/* Plugin/* composer.phar Config/core.local.php -Config/facebook.php + diff --git a/.htaccess b/.htaccess old mode 100644 new mode 100755 diff --git a/Config/facebook.php b/Config/facebook.php new file mode 100755 index 0000000..96c4cf3 --- /dev/null +++ b/Config/facebook.php @@ -0,0 +1,6 @@ + '', + 'secret' => '' +); \ No newline at end of file diff --git a/Console/Command/PopulateShell.php b/Console/Command/PopulateShell.php old mode 100644 new mode 100755 diff --git a/Console/Command/SyncShell.php b/Console/Command/SyncShell.php old mode 100644 new mode 100755 diff --git a/Console/Command/Task/ProgressBarTask.php b/Console/Command/Task/ProgressBarTask.php old mode 100644 new mode 100755 diff --git a/Controller/CompaniesController.php b/Controller/CompaniesController.php old mode 100644 new mode 100755 diff --git a/Controller/Component/Auth/FacebookAuthenticate.php b/Controller/Component/Auth/FacebookAuthenticate.php old mode 100644 new mode 100755 diff --git a/Controller/UsersController.php b/Controller/UsersController.php old mode 100644 new mode 100755 diff --git a/Event/EventCentral.php b/Event/EventCentral.php old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/Model/CompaniesUser.php b/Model/CompaniesUser.php old mode 100644 new mode 100755 diff --git a/Model/Company.php b/Model/Company.php old mode 100644 new mode 100755 diff --git a/Model/User.php b/Model/User.php old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Test/Case/Controller/CompaniesControllerTest.php b/Test/Case/Controller/CompaniesControllerTest.php old mode 100644 new mode 100755 diff --git a/Test/Case/Controller/UsersControllerTest.php b/Test/Case/Controller/UsersControllerTest.php old mode 100644 new mode 100755 diff --git a/Test/Case/Model/CompaniesUserTest.php b/Test/Case/Model/CompaniesUserTest.php old mode 100644 new mode 100755 diff --git a/Test/Case/Model/CompanyTest.php b/Test/Case/Model/CompanyTest.php old mode 100644 new mode 100755 diff --git a/Test/Case/Model/UserTest.php b/Test/Case/Model/UserTest.php old mode 100644 new mode 100755 diff --git a/Test/Fixture/CompaniesUserFixture.php b/Test/Fixture/CompaniesUserFixture.php old mode 100644 new mode 100755 diff --git a/Test/Fixture/CompanyFixture.php b/Test/Fixture/CompanyFixture.php old mode 100644 new mode 100755 diff --git a/Test/Fixture/UserFixture.php b/Test/Fixture/UserFixture.php old mode 100644 new mode 100755 diff --git a/View/Companies/add.ctp b/View/Companies/add.ctp old mode 100644 new mode 100755 diff --git a/View/Companies/edit.ctp b/View/Companies/edit.ctp old mode 100644 new mode 100755 diff --git a/View/Companies/index.ctp b/View/Companies/index.ctp old mode 100644 new mode 100755 diff --git a/View/Companies/map.ctp b/View/Companies/map.ctp old mode 100644 new mode 100755 diff --git a/View/Companies/view.ctp b/View/Companies/view.ctp old mode 100644 new mode 100755 diff --git a/View/Elements/facebook_init.ctp b/View/Elements/facebook_init.ctp old mode 100644 new mode 100755 diff --git a/View/Users/add.ctp b/View/Users/add.ctp old mode 100644 new mode 100755 diff --git a/View/Users/edit.ctp b/View/Users/edit.ctp old mode 100644 new mode 100755 diff --git a/View/Users/index.ctp b/View/Users/index.ctp old mode 100644 new mode 100755 diff --git a/View/Users/view.ctp b/View/Users/view.ctp old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 diff --git a/get_started.txt b/get_started.txt old mode 100644 new mode 100755 diff --git a/tmp/.keep b/tmp/.keep old mode 100644 new mode 100755 diff --git a/webroot/js/jquery.min.js b/webroot/js/jquery.min.js old mode 100644 new mode 100755