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
Refactoring
givanz7bff6ca78eb0
diff --git a/admin/controller/theme/themes.php b/admin/controller/theme/themes.phpindex 545e459..57c60f3 100755--- a/admin/controller/theme/themes.php+++ b/admin/controller/theme/themes.php@@ -35,7 +35,7 @@ class Themes extends Base {$theme = sanitizeFileName(basename($this->request->get['theme'] ?? ''));if ($theme) {- if (rrmdir(DIR_THEMES . DS . $theme)) {+ if (rrmdir(DIR_THEMES . $theme)) {$this->view->success[] = _('Theme removed!');} else {$this->view->errors[] = _('Error removing theme!');diff --git a/admin/controller/tools/cache.php b/admin/controller/tools/cache.phpindex 6e522d4..fe2e0f6 100755--- a/admin/controller/tools/cache.php+++ b/admin/controller/tools/cache.php@@ -36,7 +36,7 @@ class Cache extends Base {return $this->index();}-+function delete() {return $this->clear('delete');}@@ -56,7 +56,7 @@ class Cache extends Base {function asset() {return $this->clear('clearFrontend');}-+function model() {return $this->clear('clearModelCache');}@@ -68,7 +68,8 @@ class Cache extends Base {function stale() {return $this->index();}-+function index() {+ $this->view->isPageCacheDirWritable = is_writable(DIR_PUBLIC . PAGE_CACHE_DIR);}}diff --git a/admin/controller/tools/cron.php b/admin/controller/tools/cron.phpindex 837f679..bf0d98a 100755--- a/admin/controller/tools/cron.php+++ b/admin/controller/tools/cron.php@@ -33,7 +33,7 @@ class Cron extends Base {$site = Sites::getSiteById($this->global['site_id']);$view->cron = CronList::getCrons();- $view->cronkey = \Vvveb\get_config('app.cronkey');+ $view->cronkey = \Vvveb\getConfig('app.cronkey');$view->cron_url = $site['href'] . '/run-cron/' . $view->cronkey;$view->cron_cli = 'php ' . DIR_ROOT . 'cli.php app module=cron/index';}diff --git a/admin/controller/tools/systeminfo.php b/admin/controller/tools/systeminfo.phpindex d26be43..e61966b 100755--- a/admin/controller/tools/systeminfo.php+++ b/admin/controller/tools/systeminfo.php@@ -24,6 +24,7 @@ namespace Vvveb\Controller\Tools;use function Vvveb\__;use Vvveb\Controller\Base;+use Vvveb\System\Event;class SystemInfo extends Base {function index() {@@ -46,30 +47,35 @@ class SystemInfo extends Base {$database .= ' | ' . sprintf(__('Server version: %s'), $info);}+ (extension_loaded('gd') && $imageLibrary = 'gd') ||+ (extension_loaded('imagick') && $imageLibrary = 'imagick') ||+ ($imageLibrary = 'mockup (Imagick or GD not enabled!)');+$info = ['general' => [- __('Vvveb version') => V_VERSION,- __('Admin path') => \Vvveb\adminPath(),- __('PHP version') => phpversion() . ' | ' . php_sapi_name(),- __('Server') => $_SERVER['SERVER_SOFTWARE'] ?? '',- __('OS version') => php_uname(),- __('Database driver & version') => $database,- __('PHP time limit') => ini_get('max_execution_time'),- __('PHP memory limit') => ini_get('memory_limit'),- __('Max input time') => ini_get('max_input_time'),- __('Upload max filesize') => ini_get('upload_max_filesize'),- __('PHP post max size') => ini_get('post_max_size'),- __('Extensions') => implode(' ', get_loaded_extensions()),- __('Page cache') => (defined('PAGE_CACHE') && PAGE_CACHE) ? __('enabled') : __('disabled'),- __('Object cache') => \Vvveb\get_config('app.cache.driver'),- __('Email Driver') => \Vvveb\get_config('app.email.driver'),- __('Session Driver') => \Vvveb\get_config('app.session.driver'),- __('Debug') => DEBUG ? __('enabled') : __('disabled'),- __('Sql changes check') => SQL_CHECK ? __('enabled') : __('disabled'),+ __('Vvveb version') => V_VERSION,+ __('Admin path') => \Vvveb\adminPath(),+ __('PHP version') => phpversion() . ' | ' . php_sapi_name(),+ __('Server') => $_SERVER['SERVER_SOFTWARE'] ?? '',+ __('OS version') => php_uname(),+ __('Database driver & version') => $database,+ __('PHP time limit') => ini_get('max_execution_time'),+ __('PHP memory limit') => ini_get('memory_limit'),+ __('Max input time') => ini_get('max_input_time'),+ __('Upload max filesize') => ini_get('upload_max_filesize'),+ __('PHP post max size') => ini_get('post_max_size'),+ __('Extensions') => implode(' ', get_loaded_extensions()),+ __('Page cache') => (defined('PAGE_CACHE') && PAGE_CACHE) ? __('enabled') : __('disabled'),+ __('Object cache') => \Vvveb\getConfig('app.cache.driver'),+ __('Email Driver') => \Vvveb\getConfig('app.email.driver'),+ __('Session Driver') => \Vvveb\getConfig('app.session.driver'),+ __('Debug') => DEBUG ? __('enabled') : __('disabled'),+ __('Sql changes check') => SQL_CHECK ? __('enabled') : __('disabled'),+ __('Image library') => $imageLibrary,],'server' => [- __('Document root') => $_SERVER['DOCUMENT_ROOT'] ?? '',- __('Public path') => PUBLIC_PATH ?? '',+ __('Document root') => $_SERVER['DOCUMENT_ROOT'] ?? '',+ __('Public path') => PUBLIC_PATH ?? '',],];@@ -78,6 +84,8 @@ class SystemInfo extends Base {$info['server'][$key] = $value;}+ list($info) = Event::trigger(__CLASS__, __FUNCTION__, $info);+$this->view->info = $info;/*ob_start();diff --git a/admin/controller/user/user.php b/admin/controller/user/user.phpindex c7fb3ff..793437b 100755--- a/admin/controller/user/user.php+++ b/admin/controller/user/user.php@@ -44,7 +44,6 @@ class User extends Base {$sqlModel = 'Vvveb\Sql\\' . ucfirst($this->type) . 'SQL';$users = new $sqlModel();$user = $users->get($options);- $view->user = $user;if (isset($user['password'])) {//don't show password hashdiff --git a/admin/template/admin/user.tpl b/admin/template/admin/user.tplindex df01b62..b64c04c 100755--- a/admin/template/admin/user.tpl+++ b/admin/template/admin/user.tpl@@ -51,7 +51,7 @@ import(common.tpl)/* Site access */-#all-sites-check|addNewAttribute = <?php if (empty($this->user['site_access'])) echo 'checked';?>+#all-sites-check|addNewAttribute = <?php if (!isset($this->user['site_access']) || empty($this->user['site_access'])) echo 'checked';?>[data-v-sites] [data-v-site]|deleteAllButFirstChild@@ -61,7 +61,7 @@ if(isset($this->sitesList) && is_array($this->sitesList)) {foreach ($this->sitesList as $index => $site) { ?>[data-v-sites] [data-v-site] [data-v-*]|innerText = $site['@@__data-v-(*)__@@']- [data-v-sites] [data-v-site] input[type="checkbox"]|addNewAttribute = <?php if (in_array($site['site_id'], $this->user['site_access'])) echo 'checked';?>+ [data-v-sites] [data-v-site] input[type="checkbox"]|addNewAttribute = <?php if (isset($this->user['site_access']) && in_array($site['site_id'], $this->user['site_access'])) echo 'checked';?>[data-v-sites] [data-v-site]|after = <?phpdiff --git a/admin/template/content/edit.tpl b/admin/template/content/edit.tplindex 41d3142..4eae18f 100644--- a/admin/template/content/edit.tpl+++ b/admin/template/content/edit.tpl@@ -56,14 +56,14 @@ if ($optgroup != $option['folder']) {-/* language tabs */[data-v-languages]|before = <?php $_lang_instance = '@@__data-v-languages__@@';$_i = 0;?>-[data-v-languages] [data-v-language]|deleteAllButFirstChild-//[data-v-languages] [data-v-language]|addClass = <?php if ($_i == 0) echo 'active';?>+@language = [data-v-languages] [data-v-language]+@language|deleteAllButFirstChild+//@language|addClass = <?php if ($_i == 0) echo 'active';?>-[data-v-languages] [data-v-language]|before = <?php+@language|before = <?phpforeach ($this->languagesList as $language) {$content = $this->{{type}}['{{type}}_content'][$language['language_id']] ?? [];@@ -71,13 +71,13 @@ foreach ($this->languagesList as $language) {[data-v-languages] [data-v-language-id]|id = <?php echo 'lang-' . $language['code'] . '-' . $_lang_instance;?>[data-v-languages] [data-v-language-id]|addClass = <?php if ($_i == 0) echo 'show active';?>- [data-v-languages] [data-v-language] [data-v-language-name] = $language['name']- [data-v-languages] [data-v-language] [data-v-language-img]|title = $language['name']- [data-v-languages] [data-v-language] [data-v-language-img]|src = <?php echo 'language/' . $language['code'] . '/' . $language['code'] . '.png';?>- [data-v-languages] [data-v-language] [data-v-language-link]|href = <?php echo '#lang-' . $language['code'] . '-' . $_lang_instance?>- [data-v-languages] [data-v-language] [data-v-language-link]|addClass = <?php if ($_i == 0) echo 'active';?>+ @language [data-v-language-name] = $language['name']+ @language [data-v-language-img]|title = $language['name']+ @language [data-v-language-img]|src = <?php echo 'language/' . $language['code'] . '/' . $language['code'] . '.png';?>+ @language [data-v-language-link]|href = <?php echo '#lang-' . $language['code'] . '-' . $_lang_instance?>+ @language [data-v-language-link]|addClass = <?php if ($_i == 0) echo 'active';?>-[data-v-languages] [data-v-language]|after = <?php+@language|after = <?php$_i++;}?>@@ -116,24 +116,44 @@ $_i++;/* Revisions */-[data-v-languages] [data-v-language] [data-v-revision]|deleteAllButFirstChild+@revision = [data-v-languages] [data-v-language] [data-v-revision]+@revision|deleteAllButFirstChild-[data-v-languages] [data-v-language] [data-v-revision]|before = <?php+@revision|before = <?php$revisions = $content['revision'];foreach ($revisions as $revision) {?>- [data-v-languages] [data-v-language] [data-v-revision] [data-v-revision-*] = $revision['@@__data-v-revision-(*)__@@']+ @revision [data-v-revision-*]|innerText = $revision['@@__data-v-revision-(*)__@@']+ @revision a[data-v-revision-*]|href = $revision['@@__data-v-revision-(*)__@@']- [data-v-languages] [data-v-language] [data-v-revision]|data-type = '{{type}}'- [data-v-languages] [data-v-language] [data-v-revision]|data-{{type}}_id = $revision['{{type}}_id']- [data-v-languages] [data-v-language] [data-v-revision]|data-language_id = $revision['language_id']- [data-v-languages] [data-v-language] [data-v-revision]|data-created_at = $revision['created_at']+ @revision|data-type = '{{type}}'+ @revision|data-{{type}}_id = $revision['{{type}}_id']+ @revision|data-language_id = $revision['language_id']+ @revision|data-created_at = $revision['created_at']-[data-v-languages] [data-v-language] [data-v-revision]|after = <?php+@revision|after = <?php}?>[data-v-{{type}}] [data-v-revisions_url]|href = $this->revisions_url++@site = [data-v-sites] [data-v-site]+@site|deleteAllButFirstChild++@site|before = <?php+if(isset($this->sitesList) && is_array($this->sitesList)) {+ foreach ($this->sitesList as $index => $site) {?>++ @site [data-v-*]|innerText = $site['@@__data-v-(*)__@@']+ @site [data-v-*]|title = $site['@@__data-v-(*)__@@']+ @site input[data-v-*]|addNewAttribute = <?php if (isset($site['selected']) && $site['selected']) echo 'checked';?>+++ @site|after = <?php+ }+}?>++import(content/post_taxonomy.tpl)\ No newline at end of filediff --git a/admin/template/content/revisions.tpl b/admin/template/content/revisions.tplindex f435d96..592d521 100644--- a/admin/template/content/revisions.tpl+++ b/admin/template/content/revisions.tpl@@ -10,8 +10,9 @@ img[data-v-post-*]|src = $this->post['@@__data-v-post-(*)__@@']@revision|before = <?phpforeach ($this->revisions as $revision) {?>- @revision|value = $revision['created_at']- @revision = <?php echo Vvveb\friendlyDate($revision['created_at']) . ' | ' . $revision['created_at'] . ' | ' .$revision['display_name'];?>+ @revision = <?php echo Vvveb\friendlyDate($revision['created_at']) . ' | ' . $revision['created_at'] . ' | ' .$revision['display_name'];?>+ @revision|value = $revision['created_at']+ @revision|addNewAttribute = <?php if (isset($this->options['created_at']) && ($this->options['created_at'] == $revision['created_at'])) echo 'selected';?>@revision|after = <?php}diff --git a/admin/template/ifmacros.tpl b/admin/template/ifmacros.tplindex 475f9c5..4607583 100755--- a/admin/template/ifmacros.tpl+++ b/admin/template/ifmacros.tpl@@ -15,18 +15,5 @@ if (!@($condition) || (isset($vvveb_is_page_edit) && $vvveb_is_page_edit)) {[data-v-if-not]|after = <?php } ?>--//class if-[data-v-class-if-*]|addClass = <?php-$condition = @@macro IfCondition("@@__data-v-class-if-*__@@")@@;-if (($condition) || (isset($vvveb_is_page_edit) && $vvveb_is_page_edit)) {- echo '@@__data-v-class-if-(.+)__@@';-}?>---//class if not-[data-v-class-if-not-*]|addClass = <?php-$condition = @@macro IfCondition("@@__data-v-class-if-not-*__@@")@@;-if (!($condition) || (isset($vvveb_is_page_edit) && $vvveb_is_page_edit)) {- echo '@@__data-v-class-if-not-(.+)__@@';-}?>+[data-v-class-if-*]|addClass = <?php @@macro IfClass("")@@?>+[data-v-class-if-not-*]|addClass = <?php @@macro IfClass("")@@?>\ No newline at end of filediff --git a/admin/template/settings/site.tpl b/admin/template/settings/site.tplindex 760e10a..533964f 100755--- a/admin/template/settings/site.tpl+++ b/admin/template/settings/site.tpl@@ -182,3 +182,47 @@ select[data-v-setting]|before =input[type="checkbox"][data-v-*]|addNewAttribute = <?phpif (isset($this->setting[$_setting])) echo 'checked';?>+++++/* language tabs */++[data-v-languages]|before = <?php $_lang_instance = '@@__data-v-languages__@@';$_i = 0;?>+@language = [data-v-languages] [data-v-language]+@language|deleteAllButFirstChild+//@language|addClass = <?php if ($_i == 0) echo 'active';?>++@language|before = <?php++foreach ($this->languagesList as $language) {+ $content = $this->site['description'][$language['language_id']] ?? [];+?>+ [data-v-languages] [data-v-language-id]|id = <?php echo 'lang-' . $language['code'] . '-' . $_lang_instance;?>+ [data-v-languages] [data-v-language-id]|addClass = <?php if ($_i == 0) echo 'show active';?>++ @language [data-v-language-name] = $language['name']+ @language [data-v-language-img]|title = $language['name']+ @language [data-v-language-img]|src = <?php echo 'language/' . $language['code'] . '/' . $language['code'] . '.png';?>+ @language [data-v-language-link]|href = <?php echo '#lang-' . $language['code'] . '-' . $_lang_instance?>+ @language [data-v-language-link]|addClass = <?php if ($_i == 0) echo 'active';?>++@language|after = <?php+$_i++;+}+?>++[data-v-languages] input[data-v-site-description-*]|name = <?php echo 'settings[description][' . $language['language_id'] . '][@@__data-v-site-description-(*)__@@]';?>+[data-v-languages] textarea[data-v-site-description-*]|name = <?php echo 'settings[description][' . $language['language_id'] . '][@@__data-v-site-description-(*)__@@]';?>++[data-v-languages] input[data-v-site-description-*]|value = <?php+ $desc = '@@__data-v-site-description-(*)__@@';+ if (isset($content[$desc]))+ echo $content[$desc];+?>++[data-v-languages] [data-v-site-description-*]|innerText = <?php+ $desc = '@@__data-v-site-description-(*)__@@';+ if (isset($this->site['description'][$language['language_id']][$desc]))+ echo $this->site['description'][$language['language_id']][$desc];+?>\ No newline at end of filediff --git a/app/component/menu.php b/app/component/menu.phpindex e202c80..f73430f 100755--- a/app/component/menu.php+++ b/app/component/menu.php@@ -57,6 +57,7 @@ class Menu extends ComponentBase {foreach ($results['menus'] as $taxonomy_item_id => &$category) {$parent_id = $category['parent_id'] ?? false;+ $type = $category['type'] ?? 'link';if ($current_category_slug == $category['slug']) {$category['active'] = true;@@ -77,16 +78,16 @@ class Menu extends ComponentBase {$parent['children'] = 1;}- if ($category['type'] == 'text') {+ if ($type == 'text') {$parent['has-text'] = true;}}- if ($category['type'] == 'product') {+ if ($type == 'product') {$productIds[$taxonomy_item_id] = $category['item_id'];}- if ($category['type'] == 'post' || $category['type'] == 'page') {+ if ($type == 'post' || $type == 'page') {$postIds[$taxonomy_item_id] = $category['item_id'];}}diff --git a/app/component/site.php b/app/component/site.phpindex 6ea75c8..c56fedb 100755--- a/app/component/site.php+++ b/app/component/site.php@@ -42,7 +42,7 @@ class Site extends ComponentBase {}function results() {- $results = siteSettings($this->options['site_id']);+ $results = siteSettings($this->options['site_id'], $this->options['language_id']);if (! $results) {$results = ['logo'=>'logo.png', 'logo-sticky' => 'logo.png', 'logo-dark' => 'logo-white.png', 'logo-dark-sticky' => 'logo-white.png', 'favicon' => 'favicon.ico'];diff --git a/app/controller/cron.php b/app/controller/cron.phpindex 172d7b8..5829e46 100755--- a/app/controller/cron.php+++ b/app/controller/cron.php@@ -33,7 +33,7 @@ class Cron {if (defined('CLI')) {} else {$key = $this->request->get['key'];- $cronkey = \Vvveb\get_config('app.cronkey');+ $cronkey = \Vvveb\getConfig('app.cronkey');if ($key != $cronkey) {die('Invalid key!');@@ -57,7 +57,7 @@ class Cron {}function call() {- $cronkey = \Vvveb\get_config('app.cronkey');+ $cronkey = \Vvveb\getConfig('app.cronkey');echo $url = url('cron/index', ['key' => $cronkey]);$options = ['timeout' => 0.01,diff --git a/config/admin-menu.php b/config/admin-menu.phpindex 4c657a5..5386628 100755--- a/config/admin-menu.php+++ b/config/admin-menu.php@@ -541,7 +541,7 @@ return'url' => $admin_path . '?module=field/field-groups','module' => 'field/field-groups','action' => 'index',- 'icon' => 'la la-brush',+ 'icon' => 'la la-stream',],'new' => ['name' => __('Add new'),@@ -931,7 +931,7 @@ return'url' => $admin_path . '?module=tools/cache','module' => 'tools/cache','action' => 'index',- 'icon' => 'icon-globe-outline',+ 'icon' => 'icon-build-outline','class' => 'align-top','items' => ['cache' => [diff --git a/php.ini b/php.iniindex 50d0a86..76ca29e 100755--- a/php.ini+++ b/php.ini@@ -1,4 +1,4 @@-session.auto_start = On+session.auto_start = Offsession.use_only_cookies = Onsession.use_cookies = Onsession.use_trans_sid = Offdiff --git a/public/.htaccess b/public/.htaccessindex add06bf..e62ea7d 100755--- a/public/.htaccess+++ b/public/.htaccess@@ -73,7 +73,7 @@ RewriteRule ^ index.php [L]</FilesMatch></IfModule>-FileETag None+#FileETag None<IfModule mod_expires.c>ExpiresActive Ondiff --git a/system/db/dbdriver.php b/system/db/dbdriver.phpindex ed9a209..7b43ef0 100755--- a/system/db/dbdriver.php+++ b/system/db/dbdriver.php@@ -292,8 +292,12 @@ class DBDriver {function ($matches) use (&$parameters, &$sql, &$index) {$value = $parameters[$index++];+ if (is_array($value)) {+ $value = var_export($value, 1);+ } else {if (! is_numeric($value)) {$value = "'$value'";+ }}return $value;diff --git a/system/functions/php-mo.php b/system/functions/php-mo.phpindex bc51540..8128edc 100755--- a/system/functions/php-mo.php+++ b/system/functions/php-mo.php@@ -55,7 +55,7 @@ function phpmo_clean_helper($x) {$x = str_replace("\"\n\"", '', $x);$x = str_replace('$', '\\$', $x);$x = str_replace('\\\\', '\\', $x);- $x = preg_replace('/\+(["\$n])/', '\$1', $x);+ $x = preg_replace('/\+(["\$n])/', '\$1', $x);}return $x;@@ -122,8 +122,9 @@ function phpmo_parse_po_file($in) {// untranslated-stringif (sizeof($temp)) {$hash[] = $temp;- $temp = [];+ $temp = [];}+case 'msgid_plural':// untranslated-string-plural$state = $key;@@ -195,15 +196,15 @@ function phpmo_parse_po_file($in) {return $hash;}-function phpmo_po_text($hash) {$text = '';+foreach ($hash as $id => $value) {- $msgid = phpmo_clean_helper(addcslashes($value['msgid'] ?? '', '"'));+ $msgid = phpmo_clean_helper(addcslashes($value['msgid'] ?? '', '"'));$msgstr = phpmo_clean_helper(addcslashes($value['msgstr'][0] ?? '', '"'));$text .= "msgid \"$msgid\"\nmsgstr \"$msgstr\"\n\n";}-+return $text;}@@ -211,10 +212,10 @@ function phpmo_po_text($hash) {/* @link http://www.gnu.org/software/gettext/manual/gettext.html#MO-Files */function phpmo_write_po_file($hash, $out) {$text = phpmo_po_text($hash);+return file_put_contents($out, $text);}-/* Write a GNU gettext style machine object. *//* @link http://www.gnu.org/software/gettext/manual/gettext.html#MO-Files */function phpmo_write_mo_file($hash, $out) {@@ -229,8 +230,9 @@ function phpmo_write_mo_file($hash, $out) {foreach ($hash as $index => &$entry) {//don't add empty translations- if (!$entry['msgstr'] || !$entry['msgstr'][0]) {+ if (! $entry['msgstr'] || ! $entry['msgstr'][0]) {unset($hash[$index]);+continue;}@@ -246,7 +248,7 @@ function phpmo_write_mo_file($hash, $out) {// plural msgstrs are NUL-separated$str = implode("\x00", $entry['msgstr']);- $str = str_replace('\n',"\n", $str);//restore newlines+ $str = str_replace('\n',"\n", $str); //restore newlines// keep track of offsets$offsets[] = [