Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Default language fix and site multi language description
givanz073bdc45a875
diff --git a/admin/controller/base.php b/admin/controller/base.phpindex ad1a5b5..465e098 100755--- a/admin/controller/base.php+++ b/admin/controller/base.php@@ -23,7 +23,7 @@namespace Vvveb\Controller;use function Vvveb\__;-use function Vvveb\array_insert_array_after;+use function Vvveb\arrayInsertArrayAfter;use function Vvveb\availableCurrencies;use function Vvveb\availableLanguages;use function Vvveb\clearLanguageCache;@@ -65,6 +65,7 @@ class Base {$this->session->set('site_id', $site_id);$this->session->set('site_url', $site['host']);$this->session->set('site', $site['id']);+ $this->session->set('host', $site['host']);$this->session->set('state', $site['state'] ?? 'live');return $site_id;@@ -95,7 +96,7 @@ class Base {],];- $custom_posts_types = \Vvveb\get_setting('post', 'types', []);+ $custom_posts_types = \Vvveb\getSetting('post', 'types', []);$custom_posts_types += $default_custom_posts;list($custom_posts_types) = Event::trigger(__CLASS__, __FUNCTION__, $custom_posts_types);@@ -144,7 +145,7 @@ class Base {'icon' => $icon,]];- $posts_menu[$type]['items'] = array_insert_array_after('taxonomy-heading', $posts_menu[$type]['items'], $tax);+ $posts_menu[$type]['items'] = arrayInsertArrayAfter('taxonomy-heading', $posts_menu[$type]['items'], $tax);}}@@ -162,7 +163,7 @@ class Base {],];- $custom_products_types = \Vvveb\get_setting('product', 'types', []);+ $custom_products_types = \Vvveb\getSetting('product', 'types', []);$custom_products_types += $default_custom_products;list($custom_products_types) = Event::trigger(__CLASS__, __FUNCTION__, $custom_products_types);@@ -208,7 +209,7 @@ class Base {'icon' => $icon,]];- $products_menu[$type]['items'] = array_insert_array_after('taxonomy-heading', $products_menu[$type]['items'], $tax);+ $products_menu[$type]['items'] = arrayInsertArrayAfter('taxonomy-heading', $products_menu[$type]['items'], $tax);}}@@ -287,18 +288,19 @@ class Base {protected function language($defaultLanguage, $defaultLanguageId) {$languages = availableLanguages();- if (($language = ($this->request->post['language'] ?? false)) && ! is_array($language)) {- $language = filter('/[A-Za-z_-]+/', $language, 50);+ $default_language = $this->session->get('default_language');+ $default_language_id = $this->session->get('default_language_id');+ $language = $this->session->get('language');+ $language_id = $this->session->get('language_id');++ if (($lang = ($this->request->post['language'] ?? false)) && ! is_array($lang)) {+ $language = filter('/[A-Za-z_-]+/', $lang, 50);$this->session->set('language', $language);- $this->session->set('language_id', $languages[$language]['language_id'] ?? $defaultLanguageId);+ $this->session->set('language_id', $languages[$language]['language_id']);+ $default_language = false; //recheck default languageclearLanguageCache($language);}- $default_language = $this->session->get('default_language') ?? $default_language = $defaultLanguage;- $default_language_id = $this->session->get('default_language_id') ?? $default_language_id = $defaultLanguageId;- $language = $this->session->get('language') ?? $language = $default_language;- $language_id = $this->session->get('language_id') ?? $language_id = $defaultLanguageId;-if (! $default_language) {foreach ($languages as $code => $lang) {if ($lang['default']) {@@ -423,6 +425,7 @@ class Base {if (Admin::hasPermission('settings/site/save')) {if (Sites::setSiteDataById($site_id, 'state', $state)) {$this->session->set('state', $state);+ PageCache::getInstance()->purge();}} else {$message = __('Your role does not have permission to access this action!');@@ -434,6 +437,7 @@ class Base {$limit = $this->request->get['limit'] ?? 10;$this->global['site_id'] = $site_id;+ $this->global['host'] = $this->session->get('host');$this->global['admin_id'] = $admin['admin_id'];$this->global['state'] = $state;$this->global['page'] = $page;@@ -476,11 +480,11 @@ class Base {//custom posts -- add to menu$this->taxonomies = $this->getTaxonomies();$posts_menu = $this->customPost();- $menu = array_insert_array_after('edit', $menu, $posts_menu);+ $menu = arrayInsertArrayAfter('edit', $menu, $posts_menu);//products - add to menu$products_menu = $this->customProduct();- $menu = array_insert_array_after('sales', $menu, $products_menu);+ $menu = arrayInsertArrayAfter('sales', $menu, $products_menu);list($menu) = Event::trigger(__CLASS__, __FUNCTION__ . '-menu', $menu);@@ -525,6 +529,7 @@ class Base {//return \Vvveb\System\Core\FrontController::redirect('user/login');//$view = view :: getInstance();$admin_path = \Vvveb\adminPath();+ $this->view->redir = $_SERVER['REQUEST_URI'] ?? '';$this->view->action = "{$admin_path}index.php?module=user/login";$this->view->template('user/login.html');diff --git a/admin/controller/localization/language.php b/admin/controller/localization/language.phpindex 44ed37e..fff130d 100755--- a/admin/controller/localization/language.php+++ b/admin/controller/localization/language.php@@ -35,13 +35,13 @@ class Language extends Crud {protected $module = 'localization';protected $installUrl = 'https://raw.githubusercontent.com/Vvveb/{code}/master/LC_MESSAGES/';-+protected $files = ['vvveb.po', 'landing-theme.po'];protected $listUrl = 'https://www.vvveb.com/page/contribute#language';function save() {- CacheManager::delete(APP . 'cache.languages');+ CacheManager::clearObjectCache(APP, 'languages');return parent::save();}@@ -49,9 +49,9 @@ class Language extends Crud {function install() {$code = filter('/[-\w]+/', $this->request->post['code']);$url = str_replace('{code}', $code, $this->installUrl);-+require DIR_SYSTEM . 'functions' . DS . 'php-mo.php';-+foreach ($this->files as $file) {$translations = download($url . $file);@@ -61,20 +61,22 @@ class Language extends Crud {@mkdir($folder, 0755 & ~umask(), true);if (file_put_contents($poFile, $translations)) {-if (phpmo_convert($poFile)) {$this->view->success['language'] = __('Language pack installed!');} else {$this->view->errors['language'] = __('Language compilation failed!');+break;}} else {$this->view->errors[] = __('Error writing language files!');+break;}} else {$this->view->errors[] = __('Language pack not available!');$this->view->info[] = sprintf(__('Check available translations at %s'), '<a href="' . $this->listUrl . '" target="_blank">' . $this->listUrl . '</a>');+break;}}diff --git a/admin/controller/localization/translations.php b/admin/controller/localization/translations.phpindex a7a4832..2c03c8b 100755--- a/admin/controller/localization/translations.php+++ b/admin/controller/localization/translations.php@@ -23,95 +23,96 @@namespace Vvveb\Controller\Localization;use function Vvveb\__;-use function Vvveb\url;use Vvveb\Controller\Base;-use Vvveb\Sql\LanguageSQL;+use function Vvveb\url;require_once DIR_SYSTEM . 'functions' . DS . 'php-mo.php';class Translations extends Base {-function domains() {$lang = $this->request->get['lang'] ?? false;- if ($lang) {++ if ($lang) {$folder = DIR_ROOT . 'locale' . DS . $lang . DS . 'LC_MESSAGES' . DS;- $files = glob($folder . '*.po');-+ $files = glob($folder . '*.po');+$url = ['module' => 'localization/translations', 'action' => 'domain', 'lang' => $lang];//add user if does not exist yet$domains['user'] = url($url + ['domain' => 'user']);-+foreach ($files as $file) {- $domain = str_replace('.po', '', basename($file));+ $domain = str_replace('.po', '', basename($file));$domains[$domain] = url($url + ['domain' => $domain]);}-+$this->view->domains = $domains;- $this->view->count = count($domains);+ $this->view->count = count($domains);} else {$this->notFound(false, __('Invalid request!'));}}-+function save() {- $view = $this->view;+ $view = $this->view;$translations = $this->request->post['translations'] ?? [];$this->response->setType('json');-+$message = __('No data!');-+if ($translations) {//use common check po file and parse$this->domain();-+//var_dump($this->view->translations);$folder = DIR_ROOT . 'locale' . DS . $view->lang . DS . 'LC_MESSAGES' . DS;+foreach ($translations as $text => $translation) {$view->translations[$text] = ['msgid' => $text, 'msgstr' => [$translation]];}-+if (phpmo_write_po_file($view->translations, $folder . $view->domain . '.po')) {- $message = __('Saved!');-+ $message = __('Saved!');+//append user translationsif ($view->domain != 'user') {$user = $folder . 'user.po';+if (file_exists($user) && ($translations = phpmo_parse_po_file($user) ?: []) && is_array($translations)) {$view->translations = array_merge($view->translations, $translations);}}//compileif (phpmo_write_mo_file($view->translations, $folder . $view->domain . '.mo')) {- $message .= "\n" . __('Compiled!');+ $message .= "\n" . __('Compiled!');} else {- $message .= "\n" . __('Error compiling!');+ $message .= "\n" . __('Error compiling!');}} else {$message = __('Error saving!');}-}$result = ['message' => $message];$this->response->output($result);}-+function domain() {- $view = $this->view;- $view->lang = $lang = $this->request->get['lang'] ?? false;- $view->domain = $domain = $this->request->get['domain'] ?? false;- $url = ['module' => 'localization/translations', 'lang' => $lang, 'domain' => $domain];+ $view = $this->view;+ $view->lang = $lang = $this->request->get['lang'] ?? false;+ $view->domain = $domain = $this->request->get['domain'] ?? false;+ $url = ['module' => 'localization/translations', 'lang' => $lang, 'domain' => $domain];$view->domainsUrl = url($url + ['action' => 'domains']);- $view->saveUrl = url($url + ['action' => 'save']);+ $view->saveUrl = url($url + ['action' => 'save']);- if ($lang && $domain) {- $poFile = DIR_ROOT . 'locale' . DS . $lang . DS . 'LC_MESSAGES' . DS . $domain . '.po';+ if ($lang && $domain) {+ $poFile = DIR_ROOT . 'locale' . DS . $lang . DS . 'LC_MESSAGES' . DS . $domain . '.po';$view->poFile = $poFile;//$poFile = '/home/www/vvveb/vvveb/locale/ro_RO/LC_MESSAGES/vvveb.po';-+if (file_exists($poFile)) {$view->translations = phpmo_parse_po_file($poFile);- if (!is_writeable($poFile)) {++ if (! is_writeable($poFile)) {$view->info = [__('Po file not writable, saving will not work!')];}} else {diff --git a/admin/validate/site-settings.php b/admin/validate/site-settings.phpindex 2956f29..7774c57 100755--- a/admin/validate/site-settings.php+++ b/admin/validate/site-settings.php@@ -20,13 +20,4 @@**/-return [- 'title' => [- 'notEmpty' => '',- 'maxLength' => 100,- ],- 'description' => [- 'notEmpty' => '',- 'maxLength' => 255,- ],-];+return [];diff --git a/app/component/language.php b/app/component/language.phpindex dd5ceed..8f09d52 100755--- a/app/component/language.php+++ b/app/component/language.php@@ -68,7 +68,7 @@ class Language extends ComponentBase {$view = View::getInstance();if ($results) {- $results['current'] = $code = Session::getInstance()->get('language') ?? 'en_US';+ $results['current'] = $code = $request->request['language'] ?? Session::getInstance()->get('language') ?? 'en_US';$language = $results['language'][$code] ?? [];if (! $language) {diff --git a/app/controller/base.php b/app/controller/base.phpindex 4bafef5..7cea583 100755--- a/app/controller/base.php+++ b/app/controller/base.php@@ -32,6 +32,7 @@ use function Vvveb\setLanguage;use function Vvveb\siteSettings;use Vvveb\System\Core\View;use Vvveb\System\PageCache;+use Vvveb\System\Sites;use Vvveb\System\User\Admin;use Vvveb\System\User\User;@@ -40,18 +41,19 @@ class Base {protected function language($defaultLanguage, $defaultLanguageId) {$languages = availableLanguages();- if (($language = ($this->request->post['language'] ?? false)) && ! is_array($language)) {- $language = filter('/[A-Za-z_-]+/', $language, 50);+ $default_language = $this->session->get('default_language');+ $default_language_id = $this->session->get('default_language_id');+ $language = $this->session->get('language');+ $language_id = $this->session->get('language_id');++ if (($lang = ($this->request->post['language'] ?? false)) && ! is_array($lang)) {+ $language = filter('/[A-Za-z_-]+/', $lang, 50);$this->session->set('language', $language);- $this->session->set('language_id', $languages[$language]['language_id'] ?? $defaultLanguageId);+ $this->session->set('language_id', $languages[$language]['language_id']);+ $default_language = false; //recheck default languageclearLanguageCache($language);}- $default_language = $this->session->get('default_language') ?? $default_language = $defaultLanguage;- $default_language_id = $this->session->get('default_language_id') ?? $default_language_id = $defaultLanguageId;- $language = $this->session->get('language') ?? $language = $default_language;- $language_id = $this->session->get('language_id') ?? $language_id = $defaultLanguageId;-if (! $default_language) {foreach ($languages as $code => $lang) {if ($lang['default']) {@@ -150,19 +152,39 @@ class Base {}}+ $siteData = Sites :: getSiteData();++ if (isset($siteData['state']) && $siteData['state'] != 'live') {+ $admin = Admin::current();++ if (! $admin) {+ $template = Sites::getStates()[$siteData['state']]['template'];+ $this->view->template($template);++ //die($this->view->render());+ $this->response->output();+ }+ }+$site = siteSettings();$user = User::current();- $site['url'] = '//' . $_SERVER['HTTP_HOST'] ?? '';+ $site['url'] = '//' . ($_SERVER['HTTP_HOST'] ?? '');$this->global['site_id'] = SITE_ID ?? 1;$this->global['user_id'] = $user['user_id'] ?? false;$this->global['user_group_id'] = $user['user_group_id'] ?? 1;- $this->global['site'] = $site;+ $this->global['site'] = &$site;$this->global['user'] = $user ?? [];$this->language($site['language'] ?? 'en_US', $site['language_id'] ?? 1);$this->currency($site['currency'] ?? 'USD', $site['currency_id'] ?? 1);+ $language_id = $this->global['language_id'];++ if (isset($site['description'][$language_id])) {+ $site['description'] = $site['description'][$language_id];+ }+$this->view->global = $this->global;if (isset($site['country_id'])) {diff --git a/app/controller/content/post.php b/app/controller/content/post.phpindex 9bc0aef..3faa8c0 100755--- a/app/controller/content/post.php+++ b/app/controller/content/post.php@@ -24,9 +24,11 @@ namespace Vvveb\Controller\Content;use \Vvveb\Sql\PostSQL;use function Vvveb\__;-//use Vvveb\System\Component\Component;use Vvveb\Controller\Base;+//use Vvveb\System\Component\Component;+use function Vvveb\model;use Vvveb\System\Event;+use Vvveb\System\User\Admin;class Post extends Base {public $type = 'post';@@ -42,8 +44,9 @@ class Post extends Base {$result = $this->insertComment();}- $language = $this->request->get['language'] ?? $this->global['language'] ?? $this->global['default_language'];- $slug = $this->request->get['slug'] ?? '';+ $language = $this->request->get['language'] ?? $this->global['language'] ?? $this->global['default_language'];+ $slug = $this->request->get['slug'] ?? '';+ $created_at = $this->request->get['created_at'] ?? ''; //revision previewif ($slug) {$contentSql = new PostSQL();@@ -60,7 +63,7 @@ class Post extends Base {if (isset($content[$this->global['language']])) {$languageContent = $content[$this->global['language']];} else {- $languageContent = $content[$this->global['default_language']] ?? [];+ $languageContent = &$content[$this->global['default_language']] ?? [];}}@@ -68,12 +71,29 @@ class Post extends Base {$this->global['language'] = $languageContent['code'];$this->global['language_id'] = $languageContent['language_id'];- $this->session->set('language', $languageContent['code']);- $this->session->set('language_id', $languageContent['language_id']);+ //$this->session->set('language', $languageContent['code']);+ //$this->session->set('language_id', $languageContent['language_id']);++ $this->request->get['post_id'] = $languageContent['post_id'];+ $this->request->request['post_id'] = $languageContent['post_id'];+ $this->request->request['name'] = $languageContent['name'];+ $this->request->request['code'] = $languageContent['code'];+ $this->request->request['language_id'] = $languageContent['language_id'];- $this->request->get['post_id'] = $languageContent['post_id'];- $this->request->request['post_id'] = $languageContent['post_id'];- $this->request->request['name'] = $languageContent['name'];+ if ($created_at) {+ //check if admin user to allow revision preview+ $admin = Admin::current();++ if ($admin) {+ //var_dump($content);+ $revisions = model('post_content_revision');+ $revision = $revisions->get(['created_at' => $created_at, 'post_id' => $languageContent['post_id']] + $this->global);++ if ($revision && isset($revision['content'])) {+ $languageContent['content'] = $revision['content'];+ }+ }+ }if (isset($languageContent['template']) && $languageContent['template']) {$this->view->template($languageContent['template']);diff --git a/app/controller/feed/manifest.php b/app/controller/feed/manifest.phpindex 046577c..5240685 100755--- a/app/controller/feed/manifest.php+++ b/app/controller/feed/manifest.php@@ -30,7 +30,8 @@ use function Vvveb\url;#[\AllowDynamicProperties]class Manifest extends Base {function index() {- $site = siteSettings();+ $site = siteSettings();+ $description = $site['description'][$this->global['language_id']] ?? [];if ($site) {$logo = Images::image($site['logo-src'], 'logo', [144, 144]);@@ -38,13 +39,13 @@ class Manifest extends Base {$url = url('index/index', ['host' => SITE_URL, 'scheme' => $_SERVER['REQUEST_SCHEME'] ?? 'https']);$manifest = [- 'short_name' => $site['title'],+ 'short_name' => $description['title'] ?? '','lang' => $this->global['language'],'dir' => 'ltr',- 'name' => $site['title'],+ 'name' => $description['title'] ?? '','icons' => [0 => [- 'src' => $logo, //$site['logo'],+ 'src' => $logo, //$description['logo'] ?? '',//'type' => 'image/svg+xml','type' => 'image/png','sizes' => '144x144',@@ -69,19 +70,19 @@ class Manifest extends Base {'theme_color' => '#3367D6','shortcuts' => [0 => [- 'name' => $site['description'],- 'short_name' => $site['title'],- 'description' => $site['meta-description'],+ 'name' => $description['description'] ?? '',+ 'short_name' => $description['title'] ?? '',+ 'description' => $description['meta-description'] ?? '','url' => '/?source=pwa','icons' => [0 => [- 'src' => $favicon, //$site['favicon'],+ 'src' => $favicon, //$description['favicon'],'sizes' => '96x96',],],],],- 'description' => $site['meta-description'],+ 'description' => $description['meta-description'] ?? '',/*'screenshots' => [0 => [