@@ -39,17 +39,19 @@ discard block |
||
39 | 39 | { |
40 | 40 | // see if we have a key and if not we can do nothing |
41 | 41 | $key = neon()->request->post('key'); |
42 | - if (empty($key)) |
|
43 | - return; |
|
42 | + if (empty($key)) { |
|
43 | + return; |
|
44 | + } |
|
44 | 45 | $content = neon()->request->postUnsafe('content'); |
45 | 46 | $content = Html::sanitise($content, $this->inlineAllowedTags); |
46 | 47 | $pageId = neon()->request->post('pageId', null); |
47 | 48 | try { |
48 | 49 | $result = neon('cms')->getICmsStaticData()->editStaticContent($key, $pageId, $content); |
49 | - if ($result === true) |
|
50 | - return ['success'=>true, 'saved'=>$content]; |
|
51 | - else |
|
52 | - return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false]; |
|
50 | + if ($result === true) { |
|
51 | + return ['success'=>true, 'saved'=>$content]; |
|
52 | + } else { |
|
53 | + return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false]; |
|
54 | + } |
|
53 | 55 | } catch (\Exception $e) { |
54 | 56 | return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false]; |
55 | 57 | } |
@@ -67,10 +69,11 @@ discard block |
||
67 | 69 | $pageId = neon()->request->post('pageId', null); |
68 | 70 | try { |
69 | 71 | $result = neon()->cms->getICmsStaticData()->editStaticContent($key, $pageId, $content); |
70 | - if ($result === true) |
|
71 | - return ['success'=>true, 'saved'=>$content]; |
|
72 | - else if (neon()->debug) |
|
73 | - return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false]; |
|
72 | + if ($result === true) { |
|
73 | + return ['success'=>true, 'saved'=>$content]; |
|
74 | + } else if (neon()->debug) { |
|
75 | + return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false]; |
|
76 | + } |
|
74 | 77 | } catch (\Exception $e) { |
75 | 78 | return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false]; |
76 | 79 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * Update a static content widget |
64 | 64 | * @return void |
65 | 65 | */ |
66 | - public function actionUpdateContentWidget($content=null) |
|
66 | + public function actionUpdateContentWidget($content = null) |
|
67 | 67 | { |
68 | 68 | $key = neon()->request->post('key'); |
69 | 69 | $content = $content ? $content : neon()->request->postUnsafe('content'); |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | $params = neon()->request->post('params', []); |
89 | 89 | $renderer = new Renderer(new Page()); |
90 | 90 | $formatParams = ''; |
91 | - foreach($params as $key => $value) { |
|
91 | + foreach ($params as $key => $value) { |
|
92 | 92 | $formatParams .= $key.'="'.$value.'" '; |
93 | 93 | } |
94 | - $out = $renderer->renderString('{'.$tag.' '.$formatParams .' }', false); |
|
94 | + $out = $renderer->renderString('{'.$tag.' '.$formatParams.' }', false); |
|
95 | 95 | return $this->getView()->renderAjaxContent($out); |
96 | 96 | } |
97 | 97 |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $this->run('Generating Page UUIDs and nice_ids', function() { |
45 | 45 | // the soft delete column has not been added yet - so lets turn off this behaviour! |
46 | 46 | CmsPage::$softDelete = false; |
47 | - foreach(CmsPage::find()->each(100) as $page) { |
|
47 | + foreach (CmsPage::find()->each(100) as $page) { |
|
48 | 48 | $page->id = CmsPage::uuid64(); |
49 | 49 | $page->nice_id = "page_{$page->old_id}"; |
50 | 50 | $page->save(); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | "UPDATE $cms_url INNER JOIN $cms_page ON $cms_page.nice_id = $cms_url.page_id SET `page_id` = $cms_page.old_id" |
93 | 93 | ); |
94 | 94 | $this->execute("UPDATE $cms_page SET `id` = `old_id`"); |
95 | - $this->alterColumn($cms_page, 'id', $this->integer(11) . ' NOT NULL AUTO_INCREMENT'); |
|
95 | + $this->alterColumn($cms_page, 'id', $this->integer(11).' NOT NULL AUTO_INCREMENT'); |
|
96 | 96 | $this->dropColumn($cms_page, 'old_id'); |
97 | 97 | $this->dropColumn($cms_page, 'nice_id'); |
98 | 98 | $this->alterColumn($cms_url, 'page_id', $this->integer(11)->comment('cms_page foreign key')); |
@@ -7,12 +7,12 @@ discard block |
||
7 | 7 | |
8 | 8 | class m170112_211700_change_dds_page_ids_to_uuid64 extends Migration |
9 | 9 | { |
10 | - public function safeUp() |
|
11 | - { |
|
12 | - $cms_page = CmsPage::tableName(); |
|
13 | - // Step 1 |
|
10 | + public function safeUp() |
|
11 | + { |
|
12 | + $cms_page = CmsPage::tableName(); |
|
13 | + // Step 1 |
|
14 | 14 | // ------ |
15 | - // loop through all members in the DDS and find all members with a definition using |
|
15 | + // loop through all members in the DDS and find all members with a definition using |
|
16 | 16 | // {class: neon\\cms\\form\\fields\\PageSelector} |
17 | 17 | // or where the definition uses a `dataMapKey` of `pages` and a `dataMapProvider` of `cms` |
18 | 18 | $members = neon()->db->query()->select('*')->from('dds_member')->where('definition LIKE \'{"class":"neon__cms__form__fields__PageSelector%\'')->all(); |
@@ -47,10 +47,10 @@ discard block |
||
47 | 47 | } |
48 | 48 | } |
49 | 49 | $this->dropColumn($cms_page, 'old_id'); |
50 | - } |
|
50 | + } |
|
51 | 51 | |
52 | - public function safeDown() |
|
53 | - { |
|
54 | - echo "There is no coming back from this!\n"; |
|
55 | - } |
|
52 | + public function safeDown() |
|
53 | + { |
|
54 | + echo "There is no coming back from this!\n"; |
|
55 | + } |
|
56 | 56 | } |
57 | 57 | \ No newline at end of file |
@@ -27,14 +27,14 @@ |
||
27 | 27 | // - note the `member_ref` as the $column in the ddt table - this column will hold the previous integer based page id |
28 | 28 | // which will match the cms_page.old_id column |
29 | 29 | foreach ($members as $member) { |
30 | - $class_type = $member['class_type']; |
|
31 | - $ddt_table_name = 'ddt_' . $class_type; |
|
30 | + $class_type = $member['class_type']; |
|
31 | + $ddt_table_name = 'ddt_'.$class_type; |
|
32 | 32 | $column = $member['member_ref']; |
33 | 33 | |
34 | 34 | // Step 3 |
35 | 35 | // ------ |
36 | 36 | // Alter the $column in $ddt_table_name to be a uuid64 (char(22)) |
37 | - $exists = $this->db->createCommand("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE `table_name` = '$ddt_table_name' AND `table_schema` = '". env('DB_NAME')."' AND column_name = '$column'")->queryScalar(); |
|
37 | + $exists = $this->db->createCommand("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE `table_name` = '$ddt_table_name' AND `table_schema` = '".env('DB_NAME')."' AND column_name = '$column'")->queryScalar(); |
|
38 | 38 | if ($exists) { |
39 | 39 | $this->alterColumn($ddt_table_name, $column, $this->char(22)->comment("A uuid using base 64")); |
40 | 40 | // Update the $column value in every row in the $ddt_table_name by matching it to the cms_page.old_id |
@@ -27,7 +27,7 @@ |
||
27 | 27 | 'layout' => 'string COMMENT "the name of the layout template to load for this page"', |
28 | 28 | 'template' => 'string COMMENT "the name of the template file"' |
29 | 29 | ]); |
30 | - $this->createTable(CmsUrl::tableName(),[ |
|
30 | + $this->createTable(CmsUrl::tableName(), [ |
|
31 | 31 | 'id' => 'pk', |
32 | 32 | 'url' => 'string', |
33 | 33 | 'page_id' => 'int', |
@@ -10,7 +10,7 @@ |
||
10 | 10 | // created by an earlier cms migration so always appears if the |
11 | 11 | // migration creation order is not adhered to. |
12 | 12 | $connection = neon()->db; |
13 | -$sql =<<<EOQ |
|
13 | +$sql = <<<EOQ |
|
14 | 14 | SET foreign_key_checks = 0; |
15 | 15 | DROP TABLE IF EXISTS `ddt_cms_static_content`; |
16 | 16 | DELETE FROM `dds_member` WHERE `class_type`='cms_static_content'; |
@@ -7,23 +7,23 @@ |
||
7 | 7 | |
8 | 8 | class m170112_201653_cms_static_content_page_ids_to_uuid64 extends Migration |
9 | 9 | { |
10 | - public function safeUp() |
|
11 | - { |
|
12 | - $cms_static_content = CmsStaticContent::tableName(); |
|
10 | + public function safeUp() |
|
11 | + { |
|
12 | + $cms_static_content = CmsStaticContent::tableName(); |
|
13 | 13 | $cms_page = CmsPage::tableName(); |
14 | 14 | |
15 | 15 | // use a nice id |
16 | - $this->alterColumn($cms_static_content, 'page_id', $this->char(22)->null()->comment('A uuid using base 64')); |
|
16 | + $this->alterColumn($cms_static_content, 'page_id', $this->char(22)->null()->comment('A uuid using base 64')); |
|
17 | 17 | // update with nice_id's |
18 | 18 | $this->execute("UPDATE $cms_static_content JOIN $cms_page ON $cms_page.old_id = $cms_static_content.page_id SET $cms_static_content.page_id = $cms_page.id"); |
19 | - } |
|
19 | + } |
|
20 | 20 | |
21 | - public function safeDown() |
|
22 | - { |
|
21 | + public function safeDown() |
|
22 | + { |
|
23 | 23 | $cms_static_content = CmsStaticContent::tableName(); |
24 | 24 | $cms_page = CmsPage::tableName(); |
25 | 25 | |
26 | 26 | $this->execute("UPDATE $cms_static_content JOIN $cms_page ON $cms_page.id = $cms_static_content.page_id SET $cms_static_content.page_id = $cms_page.old_id"); |
27 | 27 | $this->alterColumn($cms_static_content, 'page_id', $this->integer(11)->null()); |
28 | - } |
|
28 | + } |
|
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -5,20 +5,20 @@ |
||
5 | 5 | class m161130_180814_cms_additional_page_fields extends Migration |
6 | 6 | { |
7 | 7 | |
8 | - public function safeUp() |
|
9 | - { |
|
8 | + public function safeUp() |
|
9 | + { |
|
10 | 10 | $this->addColumn('cms_page', 'keywords', "VARCHAR(1000) NULL COMMENT 'Keywords for this page'"); |
11 | 11 | $this->addColumn('cms_page', 'description', "VARCHAR(1000) NULL COMMENT 'Description of this page'"); |
12 | 12 | $this->addColumn('cms_page', 'languages', "VARCHAR(1000) NULL COMMENT 'Supported languages on this page'"); |
13 | 13 | $this->addColumn('cms_page', 'page_params', "VARCHAR(10000) NULL COMMENT 'Additional parameters for this page which are interpreted directly within the templates'"); |
14 | - } |
|
14 | + } |
|
15 | 15 | |
16 | - public function safeDown() |
|
17 | - { |
|
16 | + public function safeDown() |
|
17 | + { |
|
18 | 18 | $this->dropColumn('cms_page', 'keywords'); |
19 | 19 | $this->dropColumn('cms_page', 'description'); |
20 | 20 | $this->dropColumn('cms_page', 'languages'); |
21 | 21 | $this->dropColumn('cms_page', 'page_params'); |
22 | - } |
|
22 | + } |
|
23 | 23 | |
24 | 24 | } |
@@ -4,8 +4,8 @@ discard block |
||
4 | 4 | |
5 | 5 | class m170107_201653_cms_create_cms_static_content_table_again extends Migration |
6 | 6 | { |
7 | - public function safeUp() |
|
8 | - { |
|
7 | + public function safeUp() |
|
8 | + { |
|
9 | 9 | $cms_static = 'cms_static_content'; |
10 | 10 | |
11 | 11 | // recreate the table with the new structure |
@@ -46,10 +46,10 @@ discard block |
||
46 | 46 | // } |
47 | 47 | // } |
48 | 48 | // } while ($count < $total); |
49 | - } |
|
49 | + } |
|
50 | 50 | |
51 | - public function safeDown() |
|
52 | - { |
|
51 | + public function safeDown() |
|
52 | + { |
|
53 | 53 | $this->dropTable('cms_static_content'); |
54 | - } |
|
54 | + } |
|
55 | 55 | } |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | // recreate the table with the new structure |
12 | 12 | $this->execute("DROP TABLE IF EXISTS $cms_static"); |
13 | - $sql =<<<EOQ |
|
13 | + $sql = <<<EOQ |
|
14 | 14 | CREATE TABLE IF NOT EXISTS `cms_static_content` ( |
15 | 15 | `key` varchar(100) NOT NULL COMMENT 'a key to access the content' COLLATE utf8mb4_unicode_ci, |
16 | 16 | `page_id` INT UNSIGNED NULL COMMENT 'if provided, restrict content to the associated page', |
@@ -15,7 +15,7 @@ |
||
15 | 15 | $connection = \Yii::$app->getDb(); |
16 | 16 | |
17 | 17 | // create the various tables for dds |
18 | - $sql=<<<EOQ |
|
18 | + $sql = <<<EOQ |
|
19 | 19 | -- -------------------------------------------------------- |
20 | 20 | |
21 | 21 | -- |