Merge pull request #9757 from MrPetovan/bug/9716-show-edited-date-non-frio

[friendica.git] / view / theme / vier / style.php

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 196d3776561e165632fcfaa184f55ba206134fd6..8cd0d7a32aae8921ab67db53ee12faf928a96bb9 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -1,18 +1,33 @@
 <?php
 /**
- * @file view/theme/vier/style.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\Core\Logger;
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Model\Profile;
+use Friendica\DI;
 
-$uid = Profile::getThemeUid();
+$uid = $_REQUEST['puid'] ?? 0;
 
-$style = PConfig::get($uid, 'vier', 'style');
+$style = DI::pConfig()->get($uid, 'vier', 'style');
 
 if (empty($style)) {
-       $style = Config::get('vier', 'style');
+       $style = DI::config()->get('vier', 'style');
 }
 
 if (empty($style)) {
@@ -22,6 +37,8 @@ if (empty($style)) {
 $stylecss = '';
 $modified = '';
 
+$style = \Friendica\Util\Strings::sanitizeFilePathItem($style);
+
 foreach (['style', $style] as $file) {
        $stylecssfile = $THEMEPATH . DIRECTORY_SEPARATOR . $file .'.css';
        if (file_exists($stylecssfile)) {
@@ -44,7 +61,7 @@ header('Cache-Control: public');
 header('ETag: "'.$etag.'"');
 header('Last-Modified: '.$modified);
 
-if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
        $cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
        $cached_etag = str_replace(['"', "-gzip"], ['', ''],
                                stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));