Initial, probably buggy, port to 2.0

josegonzalez · Dec 10, 2011 · 4219ac5 · 4219ac5
1 parent fda2966
commit 4219ac5
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/controllers/components/settings.php → Controller/Component/SettingsComponent.php b/controllers/components/settings.php → Controller/Component/SettingsComponent.php
@@ -1,5 +1,5 @@
 <?php
-class SettingsComponent extends Object {
+class SettingsComponent extends Component {
 
 /**
  * Loads the settings from the cache/database, writes them to cache,

diff --git a/settings_app_controller.php → Controller/SettingsAppController.php b/settings_app_controller.php → Controller/SettingsAppController.php
diff --git a/controllers/settings_controller.php → Controller/SettingsController.php b/controllers/settings_controller.php → Controller/SettingsController.php
@@ -3,15 +3,15 @@ class SettingsController extends SettingsAppController{
 	var $name = 'Settings';
 
 	function index() {
-		if (!empty($this->data)) {
-			if ($this->Setting->saveAll($this->data['Setting'], array('validate' => 'first'))) {
+		if (!empty($this->request->data)) {
+			if ($this->Setting->saveAll($this->request->data['Setting'], array('validate' => 'first'))) {
 				$this->Session->setFlash(__('The settings has been saved', true));
 				$this->redirect(array('action' => 'index'));
 			} else {
 				$this->Session->setFlash(__('The settings could not be saved', true));
 			}
 		}
-		$this->data = $this->Setting->find('all');
+		$this->request->data = $this->Setting->find('all');
 	}
 }
 ?>
diff --git a/models/setting.php → Model/Setting.php b/models/setting.php → Model/Setting.php
@@ -1,9 +1,9 @@
 <?php
 class Setting extends SettingsAppModel {
-	var $name = 'Setting';
+	public $name = 'Setting';
 
-	function __construct($id = false, $table = null, $ds = null) {
-		parent::__construct($id, $table, $ds);
+	public function __construct($id = false, $table = null, $ds = null) {
+		parent::__construct();
 		$this->validate = array(
 			'key' => array(
 				'notempty' => array(

diff --git a/settings_app_model.php → Model/SettingsAppModel.php b/settings_app_model.php → Model/SettingsAppModel.php
diff --git a/vendors/settings_panel.php → Vendor/SettingsPanel.php b/vendors/settings_panel.php → Vendor/SettingsPanel.php
diff --git a/views/elements/settings_panel.ctp → View/elements/settings_panel.ctp b/views/elements/settings_panel.ctp → View/elements/settings_panel.ctp
diff --git a/views/settings/index.ctp → View/settings/index.ctp b/views/settings/index.ctp → View/settings/index.ctp