From 91bae627fac83a0cc503c415d0723c6fcf06261f Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Thu, 11 Feb 2016 16:08:45 +0100 Subject: [PATCH 1/5] Fix language files --- languages/cs.yaml | 1 - languages/cy.yaml | 1 - languages/de.yaml | 1 - languages/es.yaml | 1 - languages/fi.yaml | 1 - languages/fr.yaml | 1 - languages/hr.yaml | 1 - languages/hu.yaml | 1 - languages/it.yaml | 1 - languages/ja.yaml | 1 - languages/lt.yaml | 1 - languages/nl.yaml | 1 - languages/no.yaml | 1 - languages/pl.yaml | 1 - languages/pt.yaml | 1 - languages/ru.yaml | 1 - languages/sv.yaml | 1 - languages/tlh.yaml | 1 - languages/tr.yaml | 1 - languages/uk.yaml | 1 - languages/zh.yaml | 1 - 21 files changed, 21 deletions(-) diff --git a/languages/cs.yaml b/languages/cs.yaml index bf226802..42157408 100644 --- a/languages/cs.yaml +++ b/languages/cs.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Jedná se o beta verzi! V ostrém provozu používejte pouze na vlastní nebezpečí... ADMIN_REPORT_ISSUE: Objevili jste problém? Nahlaste ho, prosím, na GitHub. diff --git a/languages/cy.yaml b/languages/cy.yaml index 8a618f08..7a1168a9 100644 --- a/languages/cy.yaml +++ b/languages/cy.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Mae hwn yn fersiwn beta! Defnyddio hwn yn cynhyrchu ar risg eich hun... ADMIN_REPORT_ISSUE: Canfod problem? Rhowch wybod ar GitHub. diff --git a/languages/de.yaml b/languages/de.yaml index 2ab2b991..12de363e 100644 --- a/languages/de.yaml +++ b/languages/de.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Dies ist eine Beta-Version! Benutzung auf eigene Gefahr... ADMIN_REPORT_ISSUE: Fehler gefunden? Bitte melden Sie ihn auf GitHub. diff --git a/languages/es.yaml b/languages/es.yaml index 131ac1b5..ef0a80b8 100644 --- a/languages/es.yaml +++ b/languages/es.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: ¡Ésta es una versión Beta! Utilízala bajo tu propio riesgo... ADMIN_REPORT_ISSUE: ¿Encontraste algún problema de funcionamiento? Por favor, repórtalo en GitHub. diff --git a/languages/fi.yaml b/languages/fi.yaml index bc4f1102..30ec3008 100644 --- a/languages/fi.yaml +++ b/languages/fi.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Tämä on beta versio! Käytä tuotannossa omalla vastuulla... ADMIN_REPORT_ISSUE: Löysit virheen tai puutteen? Ilmoita siitä Github-palveluun. diff --git a/languages/fr.yaml b/languages/fr.yaml index de69b59d..d8da7ebc 100644 --- a/languages/fr.yaml +++ b/languages/fr.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Ceci est une version bêta ! Utilisez-là en production à vos risques et périls... ADMIN_REPORT_ISSUE: Vous avez rencontré une anomalie ? Veuillez la signaler sur GitHub. diff --git a/languages/hr.yaml b/languages/hr.yaml index 3903984c..5f997889 100644 --- a/languages/hr.yaml +++ b/languages/hr.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Ovo je Beta izdanje! Koristite u produkciji na vlastiti rizik... ADMIN_REPORT_ISSUE: Pronašli ste grešku? Molimo Vas da prijavite na GitHub. diff --git a/languages/hu.yaml b/languages/hu.yaml index 65ceef4a..c7d0d70c 100644 --- a/languages/hu.yaml +++ b/languages/hu.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Ez egy béta kiadás! Éles környezetben csak saját felelősségre használd... ADMIN_REPORT_ISSUE: Találtál egy hibát? Kérlek jelezd a GitHub-on. diff --git a/languages/it.yaml b/languages/it.yaml index 847eeefc..aa466492 100644 --- a/languages/it.yaml +++ b/languages/it.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Questa è una versione beta! Usare in produzione a proprio rischio e pericolo… ADMIN_REPORT_ISSUE: Trovato un problema? Per favore, apri un ticket su GitHub diff --git a/languages/ja.yaml b/languages/ja.yaml index 7c5fb60e..c0dfbff8 100644 --- a/languages/ja.yaml +++ b/languages/ja.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: これはベータリリースです。稼働中サイトでは、自己責任においてご利用ください。 ADMIN_REPORT_ISSUE: 問題を見つけた場合は、GitHub にてご報告をお願いします。 diff --git a/languages/lt.yaml b/languages/lt.yaml index e7538549..42581993 100644 --- a/languages/lt.yaml +++ b/languages/lt.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: MANAGE_PAGES: Tvarkyti puslapius PAGES: Puslapiai diff --git a/languages/nl.yaml b/languages/nl.yaml index 548716da..48cbf291 100644 --- a/languages/nl.yaml +++ b/languages/nl.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Dit is een betaversie! Gebruik op een live site is voor eigen risico... ADMIN_REPORT_ISSUE: Kom je een probleem tegen? Meld het op GitHub. diff --git a/languages/no.yaml b/languages/no.yaml index 0ae1741c..7cc26393 100644 --- a/languages/no.yaml +++ b/languages/no.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Dette er en betaversjon! Bruk denne i produksjon på egen risiko... ADMIN_REPORT_ISSUE: Oppdaget et problem? Vennligst rapport det på GitHub. diff --git a/languages/pl.yaml b/languages/pl.yaml index bb0bf0f9..0ef1ca08 100644 --- a/languages/pl.yaml +++ b/languages/pl.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: To jest wersja Beta! Używasz tego w produkcji na własne ryzyko... ADMIN_REPORT_ISSUE: Znalazłeś błąd? Zgłoś to na GitHub. diff --git a/languages/pt.yaml b/languages/pt.yaml index 260a7589..d3a3e03c 100644 --- a/languages/pt.yaml +++ b/languages/pt.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Esta é uma versão Beta! Use por sua conta em risco... ADMIN_REPORT_ISSUE: Um problema foi encontrado? Por favor, reporte no GitHub. diff --git a/languages/ru.yaml b/languages/ru.yaml index a1cf4ca9..54b1adf7 100644 --- a/languages/ru.yaml +++ b/languages/ru.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Это бета-релиз! Вы используете это расширение на свой страх и риск... ADMIN_REPORT_ISSUE: Нашли ошибку? Пожалуйста, сообщите об этом на GitHub. diff --git a/languages/sv.yaml b/languages/sv.yaml index 7edd28f9..33f9a36e 100644 --- a/languages/sv.yaml +++ b/languages/sv.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: Detta är en betaversion! Använda detta i produktion på egen risk... ADMIN_REPORT_ISSUE: Hittade ett fel? Vänligen rapportera det på GitHub. diff --git a/languages/tlh.yaml b/languages/tlh.yaml index 4c18ac04..d707ffeb 100644 --- a/languages/tlh.yaml +++ b/languages/tlh.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: LOGIN_BTN_FORGOT: lIj BACK: chap diff --git a/languages/tr.yaml b/languages/tr.yaml index 56edd028..c7a18ae6 100644 --- a/languages/tr.yaml +++ b/languages/tr.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: LOGIN_BTN: Giriş Yap LOGIN_BTN_FORGOT: Şifremi Unuttum diff --git a/languages/uk.yaml b/languages/uk.yaml index 253fd1ab..046c98e1 100644 --- a/languages/uk.yaml +++ b/languages/uk.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: LOGIN_BTN: Увійти LOGIN_BTN_FORGOT: Забув diff --git a/languages/zh.yaml b/languages/zh.yaml index 73aec8c4..bba5ba9f 100644 --- a/languages/zh.yaml +++ b/languages/zh.yaml @@ -1,4 +1,3 @@ ---- PLUGIN_ADMIN: ADMIN_BETA_MSG: 這是 Beta 版!如果要用在營運中請自行承擔風險… ADMIN_REPORT_ISSUE: 發現有問題?請回報到 GitHub 上。 From 60057c3c7578db255dbaad67eed6e36d98644588 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Thu, 11 Feb 2016 16:14:43 +0100 Subject: [PATCH 2/5] Revert "Fix issue with config blueprints auto creating config yaml files" This reverts commit b630c5cf275c4fa56bfd415eee21c19f0f7d5b4f. --- admin.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/admin.php b/admin.php index 6f098701..0d96b067 100644 --- a/admin.php +++ b/admin.php @@ -540,15 +540,6 @@ class AdminPlugin extends Plugin throw new \RuntimeException('One of the required plugins is missing or not enabled'); } - // Double check we have system.yaml and site.yaml - $config_files[] = $this->grav['locator']->findResource('user://config') . '/system.yaml'; - $config_files[] = $this->grav['locator']->findResource('user://config') . '/site.yaml'; - foreach ($config_files as $config_file) { - if (!file_exists($config_file)) { - touch($config_file); - } - } - // Initialize Admin Language if needed /** @var Language $language */ $language = $this->grav['language']; @@ -576,6 +567,15 @@ class AdminPlugin extends Plugin // And store the class into DI container. $this->grav['admin'] = $this->admin; + // Double check we have system.yam, site.yaml etc + $config_path = $this->grav['locator']->findResource('user://config'); + foreach ($this->admin->configurations() as $config_file) { + $config_file = "{$config_path}/{$config_file}.yaml"; + if (!file_exists($config_file)) { + touch($config_file); + } + } + // Get theme for admin $this->theme = $this->config->get('plugins.admin.theme', 'grav'); From 3a19af63767a76d86b10e27eeba0310e2a519bdc Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 11 Feb 2016 15:00:51 -0700 Subject: [PATCH 3/5] version update --- CHANGELOG.md | 6 ++++++ blueprints.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d55dbecb..1bc99985 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.0.9 +## 02/11/2016 + +1. [](#bugfix) + * Fix language translation files + # v1.0.8 ## 02/05/2016 diff --git a/blueprints.yaml b/blueprints.yaml index 7c70bfa1..8f060104 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Admin Panel -version: 1.0.8 +version: 1.0.9 description: Adds an advanced administration panel to manage your site icon: empire author: From c2a1a7b1925be2034a67a69bc1bd241e670eaec0 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 12 Feb 2016 10:16:28 +0100 Subject: [PATCH 4/5] Lint --- classes/controller.php | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/classes/controller.php b/classes/controller.php index c30784ae..7bcafbff 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -22,6 +22,10 @@ use RocketTheme\Toolbox\File\JsonFile; use Symfony\Component\Yaml\Exception\ParseException; use Symfony\Component\Yaml\Yaml; +/** + * Class AdminController + * @package Grav\Plugin + */ class AdminController { /** @@ -125,7 +129,7 @@ class AdminController if (method_exists($this, $method)) { try { - $success = call_user_func(array($this, $method)); + $success = call_user_func([$this, $method]); } catch (\RuntimeException $e) { $success = true; $this->admin->setMessage($e->getMessage(), 'error'); @@ -473,7 +477,7 @@ class AdminController if (count($flags)) { // Filter by state - $pageStates = array('modular', 'nonmodular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished'); + $pageStates = ['modular', 'nonmodular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished']; if (count(array_intersect($pageStates, $flags)) > 0) { if (in_array('modular', $flags)) @@ -572,7 +576,7 @@ class AdminController return false; } - $media_list = array(); + $media_list = []; foreach ($page->media()->all() as $name => $media) { $media_list[$name] = ['url' => $media->cropZoom(150, 100)->url(), 'size' => $media->get('size')]; } @@ -768,11 +772,11 @@ class AdminController } // Filter value and save it. - $this->post = array('enabled' => true); + $this->post = ['enabled' => true]; $obj = $this->prepareData(); $obj->save(); - $this->post = array('_redirect' => 'plugins'); + $this->post = ['_redirect' => 'plugins']; $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_ENABLED_PLUGIN'), 'info'); return true; @@ -947,7 +951,7 @@ class AdminController $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.INSTALLATION_FAILED'), 'error'); } - $this->post = array('_redirect' => $this->view . '/' . $this->route); + $this->post = ['_redirect' => $this->view . '/' . $this->route]; } return true; @@ -989,7 +993,6 @@ class AdminController */ private function cleanFilesData($key, $file) { - $config = $this->grav['config']; $blueprint = isset($this->items['fields'][$key]['files']) ? $this->items['fields'][$key]['files'] : []; /** @var Page $page */ @@ -1055,7 +1058,7 @@ class AdminController private function match_in_array($needle, $haystack) { foreach ((array)$haystack as $item) { - if (true == preg_match("#^" . strtr(preg_quote($item, '#'), array('\*' => '.*', '\?' => '.')) . "$#i", $needle)) { + if (true == preg_match("#^" . strtr(preg_quote($item, '#'), ['\*' => '.*', '\?' => '.']) . "$#i", $needle)) { return true; } } @@ -1133,8 +1136,9 @@ class AdminController return true; } - /* + /** * @param string $frontmatter + * * @return bool */ public function checkValidFrontmatter($frontmatter) @@ -1355,7 +1359,6 @@ class AdminController try { /** @var Pages $pages */ $pages = $this->grav['pages']; - $data = $this->post; // And then get the current page. $page = $this->admin->page(true); @@ -1431,9 +1434,6 @@ class AdminController return false; } - /** @var Uri $uri */ - $uri = $this->grav['uri']; - try { $page = $this->admin->page(); @@ -1443,8 +1443,7 @@ class AdminController Folder::delete($page->path()); } - - $results = Cache::clearCache('standard'); + Cache::clearCache('standard'); // Set redirect to either referrer or pages list. $redirect = 'pages'; From 3efbf05bea2119116a3265fc56a3226b70ba3669 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 12 Feb 2016 10:17:15 +0100 Subject: [PATCH 5/5] Clear cache after adding new folder, fix #393 --- classes/controller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/controller.php b/classes/controller.php index 7bcafbff..e73d6c2b 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -1125,6 +1125,7 @@ class AdminController } Folder::mkdir($path . '/' . $orderOfNewFolder . '.' . $data['folder']); + Cache::clearCache('standard'); $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_SAVED'), 'info');