From 5d1d0d1a9f84bf9ab8aa48473ab193a60e8ba4d5 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 18:59:08 +0000 Subject: [PATCH 01/23] Remove empty help spans from templates. The empty spans from the templates mess up the layout sometimes, and are useless weight anyway. Lets get rid of them. --- view/templates/field_checkbox.tpl | 4 +++- view/templates/field_combobox.tpl | 4 +++- view/templates/field_custom.tpl | 4 +++- view/templates/field_input.tpl | 2 ++ view/templates/field_intcheckbox.tpl | 2 ++ view/templates/field_openid.tpl | 4 +++- view/templates/field_password.tpl | 2 ++ view/templates/field_radio.tpl | 2 ++ view/templates/field_richtext.tpl | 4 +++- view/templates/field_select.tpl | 4 +++- view/templates/field_select_raw.tpl | 4 +++- view/templates/field_textarea.tpl | 4 +++- view/templates/field_themeselect.tpl | 4 +++- view/templates/field_yesno.tpl | 4 +++- 14 files changed, 38 insertions(+), 10 deletions(-) diff --git a/view/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl index b66cced876..8275d4595d 100644 --- a/view/templates/field_checkbox.tpl +++ b/view/templates/field_checkbox.tpl @@ -1,6 +1,8 @@
- + + {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl index 4586550166..876e607cdf 100644 --- a/view/templates/field_combobox.tpl +++ b/view/templates/field_combobox.tpl @@ -13,6 +13,8 @@ {{foreach $field.4 as $opt=>$val}}{{/foreach}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} diff --git a/view/templates/field_custom.tpl b/view/templates/field_custom.tpl index 0b09284023..6649b0ff94 100644 --- a/view/templates/field_custom.tpl +++ b/view/templates/field_custom.tpl @@ -3,5 +3,7 @@
{{$field.2}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl index 495493f2fd..850656bb8c 100644 --- a/view/templates/field_input.tpl +++ b/view/templates/field_input.tpl @@ -2,5 +2,7 @@
+ {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl index 73bdf60417..9c5f04e796 100644 --- a/view/templates/field_intcheckbox.tpl +++ b/view/templates/field_intcheckbox.tpl @@ -3,5 +3,7 @@
+ {{if $field.4}} {{$field.4}} + {{/if}}
diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl index 062ac6ac6e..9a18bbc13c 100644 --- a/view/templates/field_openid.tpl +++ b/view/templates/field_openid.tpl @@ -2,5 +2,7 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl index 333ce67c38..4b4d4f2b2e 100644 --- a/view/templates/field_password.tpl +++ b/view/templates/field_password.tpl @@ -2,5 +2,7 @@
+ {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl index 6b880ed997..1e1d8e0b10 100644 --- a/view/templates/field_radio.tpl +++ b/view/templates/field_radio.tpl @@ -1,5 +1,7 @@
+ {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl index 67553bb95a..bc346ddb0b 100644 --- a/view/templates/field_richtext.tpl +++ b/view/templates/field_richtext.tpl @@ -3,5 +3,7 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl index 2d037439df..87a2ab9ff8 100644 --- a/view/templates/field_select.tpl +++ b/view/templates/field_select.tpl @@ -5,5 +5,7 @@ - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl index 4c826a0427..147c028eff 100644 --- a/view/templates/field_select_raw.tpl +++ b/view/templates/field_select_raw.tpl @@ -5,5 +5,7 @@ - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl index c37537d6ec..60594a2666 100644 --- a/view/templates/field_textarea.tpl +++ b/view/templates/field_textarea.tpl @@ -3,5 +3,7 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl index 51f6057ae3..5f56c187ef 100644 --- a/view/templates/field_themeselect.tpl +++ b/view/templates/field_themeselect.tpl @@ -5,6 +5,8 @@ - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} {{if $field.5}}
{{/if}} diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl index 155d0488b3..7e7c3cc4ee 100644 --- a/view/templates/field_yesno.tpl +++ b/view/templates/field_yesno.tpl @@ -10,5 +10,7 @@ {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} From 2d8a4a923f0ff02fff2aa74ac2a2aea4d860fe41 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 19:00:47 +0000 Subject: [PATCH 02/23] Fix login dialog layout. Rearrange login dialog distinguish better between logging und registering. --- view/templates/login.tpl | 18 ++++++++------ view/theme/vier/mobile.css | 7 ++++++ view/theme/vier/style.css | 50 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/view/templates/login.tpl b/view/templates/login.tpl index e1e8c5f3a6..c2dac46f66 100644 --- a/view/templates/login.tpl +++ b/view/templates/login.tpl @@ -4,11 +4,14 @@
-
{{$login}}
+

{{$login}}

{{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} +
{{if $openid}} @@ -17,16 +20,11 @@
{{/if}} - {{include file="field_checkbox.tpl" field=$lremember}} - - -
+ + {{include file="field_checkbox.tpl" field=$lremember}} {{foreach $hiddens as $k=>$v}} @@ -35,5 +33,9 @@ + diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css index 66721a1b88..b528ca4bd0 100644 --- a/view/theme/vier/mobile.css +++ b/view/theme/vier/mobile.css @@ -91,6 +91,13 @@ nav ul { width: 100% !important; height: 110px !important; } + #login-extra-links, #login-form { + /* width: 341px; */ + width: 100%; + } + #id_remember_label { + width: unset; + } } @media screen and (max-width: 480px) { diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 710c76f6af..aad5d4384f 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2422,10 +2422,60 @@ aside #div_id_remember label { float: inherit; } +#login-group { + overflow: hidden; +} + +#login-head { + position: unset; + width: unset; + height: unset; + margin-bottom: 10px; +} + +div #wrapper_username { + padding: 0px; +} + +div #wrapper_password { + padding: 0px; + margin-bottom: 0px; +} + +#div_id_remember { + float: left; + width: unset; +} + +#remember_tip { + display: none; +} + +#login-submit-wrapper { + float: right; +} + +#login-form { + margin-top: 20px; +} + +#login-extra-links, #login-form { + /* width: 341px; */ + width: 341px; + clear: both; + border-top: 3px solid white; + padding-top: 20px; +} + aside div #login-submit-button { margin-left:0px; } +#login-lost-password-link { + margin-bottom: 10px; + float: right; +} + aside #register-link, aside #lost-password-link { display: block; } From fe74a3d697bbff697a05b34381f43ce8a04319f7 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 19:15:54 +0000 Subject: [PATCH 03/23] Remove empty help spans from templates. The empty spans from the templates mess up the layout sometimes, and are useless weight anyway. Lets get rid of them. --- view/theme/frio/templates/field_checkbox.tpl | 4 +++- view/theme/frio/templates/field_colorinput.tpl | 4 +++- view/theme/frio/templates/field_custom.tpl | 4 +++- view/theme/frio/templates/field_fileinput.tpl | 4 +++- view/theme/frio/templates/field_input.tpl | 4 +++- view/theme/frio/templates/field_intcheckbox.tpl | 4 +++- view/theme/frio/templates/field_openid.tpl | 4 +++- view/theme/frio/templates/field_password.tpl | 4 +++- view/theme/frio/templates/field_radio.tpl | 4 +++- view/theme/frio/templates/field_select.tpl | 6 ++++-- view/theme/frio/templates/field_select_raw.tpl | 6 ++++-- view/theme/frio/templates/field_textarea.tpl | 4 +++- view/theme/frio/templates/field_themeselect.tpl | 4 +++- view/theme/frio/templates/field_yesno.tpl | 2 ++ 14 files changed, 43 insertions(+), 15 deletions(-) diff --git a/view/theme/frio/templates/field_checkbox.tpl b/view/theme/frio/templates/field_checkbox.tpl index 787a82ebdc..1fde3634ab 100644 --- a/view/theme/frio/templates/field_checkbox.tpl +++ b/view/theme/frio/templates/field_checkbox.tpl @@ -4,6 +4,8 @@ - \ No newline at end of file + diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl index 886d647e9c..704db346d2 100644 --- a/view/theme/frio/templates/field_colorinput.tpl +++ b/view/theme/frio/templates/field_colorinput.tpl @@ -6,6 +6,8 @@ {{if $field.4}}{{$field.4}}{{/if}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_custom.tpl b/view/theme/frio/templates/field_custom.tpl index 20f529278d..158073a64e 100644 --- a/view/theme/frio/templates/field_custom.tpl +++ b/view/theme/frio/templates/field_custom.tpl @@ -2,5 +2,7 @@
{{$field.2}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_fileinput.tpl b/view/theme/frio/templates/field_fileinput.tpl index 721a6535fb..c5f8ac86d2 100644 --- a/view/theme/frio/templates/field_fileinput.tpl +++ b/view/theme/frio/templates/field_fileinput.tpl @@ -6,6 +6,8 @@ {{if $field.4}}{{$field.4}}{{/if}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl index bbd7535e54..62a7d72e83 100644 --- a/view/theme/frio/templates/field_input.tpl +++ b/view/theme/frio/templates/field_input.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl index 8863d14c4d..f898c87faf 100644 --- a/view/theme/frio/templates/field_intcheckbox.tpl +++ b/view/theme/frio/templates/field_intcheckbox.tpl @@ -2,6 +2,8 @@
- {{$field.4}} + {{if $field.4}} + {{$field.4}} + {{/if}}
diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl index 8081f9cf11..66f8c9e809 100644 --- a/view/theme/frio/templates/field_openid.tpl +++ b/view/theme/frio/templates/field_openid.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl index 31defaf33c..7bef420a18 100644 --- a/view/theme/frio/templates/field_password.tpl +++ b/view/theme/frio/templates/field_password.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_radio.tpl b/view/theme/frio/templates/field_radio.tpl index 42c145e3a8..725e1c96af 100644 --- a/view/theme/frio/templates/field_radio.tpl +++ b/view/theme/frio/templates/field_radio.tpl @@ -4,7 +4,9 @@ - \ No newline at end of file + diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl index 9c03151214..594b91002e 100644 --- a/view/theme/frio/templates/field_select.tpl +++ b/view/theme/frio/templates/field_select.tpl @@ -4,5 +4,7 @@ - {{$field.3}} - \ No newline at end of file + {{if $field.3}} + {{$field.3}} + {{/if}} + diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl index d4f4768603..52b63079c1 100644 --- a/view/theme/frio/templates/field_select_raw.tpl +++ b/view/theme/frio/templates/field_select_raw.tpl @@ -4,5 +4,7 @@ - {{$field.3}} - \ No newline at end of file + {{if $field.3}} + {{$field.3}} + {{/if}} + diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl index 8ef56babb7..1aea484de7 100644 --- a/view/theme/frio/templates/field_textarea.tpl +++ b/view/theme/frio/templates/field_textarea.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl index 3b2cb780c8..fc1f7243af 100644 --- a/view/theme/frio/templates/field_themeselect.tpl +++ b/view/theme/frio/templates/field_themeselect.tpl @@ -5,6 +5,8 @@ + {{if $field.3}} {{$field.3}} + {{/if}} {{if $field.5=="preview"}}
{{/if}} - \ No newline at end of file + diff --git a/view/theme/frio/templates/field_yesno.tpl b/view/theme/frio/templates/field_yesno.tpl index 85096c70e3..47649fe676 100644 --- a/view/theme/frio/templates/field_yesno.tpl +++ b/view/theme/frio/templates/field_yesno.tpl @@ -14,6 +14,8 @@ + {{if $field.3}} {{$field.3}} + {{/if}}
From e5ed2fdede23fc9368ab214a2acdda10fc4e0f1d Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 19:57:04 +0000 Subject: [PATCH 04/23] Remove complete section when registering disabled. Move out the check so that the complete div containing the register-link is removed. --- view/templates/login.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/templates/login.tpl b/view/templates/login.tpl index c2dac46f66..029ebb0343 100644 --- a/view/templates/login.tpl +++ b/view/templates/login.tpl @@ -33,9 +33,11 @@ +{{if $register}} +{{/if}} From 6a1ce9c9c0960850401dde26b474d36f70944f54 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 20:03:29 +0000 Subject: [PATCH 05/23] Fix login dialog layout for frio. Rearrange login dialog distinguish better between logging und registering. --- view/theme/frio/css/style.css | 37 +++++++++++++++++++++++++---- view/theme/frio/templates/login.tpl | 13 +++++++--- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 1614547b85..55ccff4d74 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3136,12 +3136,25 @@ section .profile-match-wrapper { * Login page */ #login-submit-wrapper { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: center; + float: right; } #lost-password-link { flex-grow: 2; } +#login-lost-password-link { + margin-bottom: 10px; + float: right; +} +#div_id_remember { + float: left; +} +#id_password_wrapper { + margin-bottom: unset; +} +#login_openid { + clear: both; +} +#register-link { + width: 100%; +} .mod-home.is-not-singleuser, .mod-login { @@ -3166,12 +3179,21 @@ section .profile-match-wrapper { margin-top: 2.5%; } +.mod-home.is-not-singleuser .login-form > #login-form, +.mod-home.is-not-singleuser .login-form > #login-extra-links, +.mod-login #content #login-form { + overflow: hidden; +} +.mod-home.is-not-singleuser .login-form > #login-extra-links { + margin-top: 4em; + margin-bottom: 1em; +} + .mod-home.is-not-singleuser .login-form > #login-form label, .mod-login #content #login-form label { color: #eee; } - .mod-home.is-not-singleuser .login-panel-content, .mod-login .login-panel-content { background-color: rgba(255,255,255,.85); @@ -3185,12 +3207,17 @@ section .profile-match-wrapper { } .mod-home.is-not-singleuser .login-form > #login-form, + .mod-home.is-not-singleuser .login-form > #login-extra-links, .mod-login #content #login-form { background-color: #fff; padding: 1em; position: relative; margin-top: 4em; } + .mod-home.is-not-singleuser .login-form > #login-extra-links { + margin-top: unset; + background-color: #8ad0a1; + } .mod-home.is-not-singleuser .login-form > #login-form label, .mod-login #content #login-form label { diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl index aaa42d24b4..332ac70df5 100644 --- a/view/theme/frio/templates/login.tpl +++ b/view/theme/frio/templates/login.tpl @@ -8,6 +8,9 @@
{{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} +
{{if $openid}} @@ -19,10 +22,7 @@ {{include file="field_checkbox.tpl" field=$lremember}}
- {{$lostlink}} -
- {{if $register}}{{$register.desc}}{{/if}}
@@ -35,4 +35,11 @@ +{{if $register}} + +{{/if}} + From 1a69265da49f02985d0afd7d57c704c9e75335e1 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Tue, 24 Apr 2018 21:16:15 +0000 Subject: [PATCH 06/23] Fix missing background tiles. --- view/theme/frio/css/style.css | 8 +++----- view/theme/frio/templates/login.tpl | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 55ccff4d74..c4d64973e3 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3155,6 +3155,9 @@ section .profile-match-wrapper { #register-link { width: 100%; } +#login-end { + clear: both; +} .mod-home.is-not-singleuser, .mod-login { @@ -3179,11 +3182,6 @@ section .profile-match-wrapper { margin-top: 2.5%; } -.mod-home.is-not-singleuser .login-form > #login-form, -.mod-home.is-not-singleuser .login-form > #login-extra-links, -.mod-login #content #login-form { - overflow: hidden; -} .mod-home.is-not-singleuser .login-form > #login-extra-links { margin-top: 4em; margin-bottom: 1em; diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl index 332ac70df5..57bb86c150 100644 --- a/view/theme/frio/templates/login.tpl +++ b/view/theme/frio/templates/login.tpl @@ -32,6 +32,7 @@ {{/foreach}} +
From d06a174f0cc4fc14267fcd606a0855592c4d1448 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Tue, 24 Apr 2018 21:18:31 +0000 Subject: [PATCH 07/23] Make register-link less obtrusive. --- view/theme/frio/css/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index c4d64973e3..9c54316058 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3153,6 +3153,8 @@ section .profile-match-wrapper { clear: both; } #register-link { + color: white; + background: #8ad0a1; width: 100%; } #login-end { @@ -3214,7 +3216,7 @@ section .profile-match-wrapper { } .mod-home.is-not-singleuser .login-form > #login-extra-links { margin-top: unset; - background-color: #8ad0a1; + background-color: white; } .mod-home.is-not-singleuser .login-form > #login-form label, From b65c8c55a4693fe12cdd6470d7528839f6885bc9 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:05:20 -0400 Subject: [PATCH 08/23] [frio] Fix formatting in PHP files --- view/theme/frio/config.php | 27 +++++++++++++---------- view/theme/frio/php/Image.php | 12 ++++------- view/theme/frio/php/schema.php | 39 ++++++++++++++++------------------ view/theme/frio/style.php | 17 +++++++-------- 4 files changed, 46 insertions(+), 49 deletions(-) diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 9081d9df47..2827919f9d 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -8,7 +8,8 @@ use Friendica\Core\System; require_once 'view/theme/frio/php/Image.php'; -function theme_post(App $a) { +function theme_post(App $a) +{ if (!local_user()) { return; } @@ -26,7 +27,8 @@ function theme_post(App $a) { } } -function theme_admin_post(App $a) { +function theme_admin_post(App $a) +{ if (!local_user()) { return; } @@ -46,7 +48,8 @@ function theme_admin_post(App $a) { } } -function theme_content(App $a) { +function theme_content(App $a) +{ if (!local_user()) { return; } @@ -64,7 +67,8 @@ function theme_content(App $a) { return frio_form($arr); } -function theme_admin(App $a) { +function theme_admin(App $a) +{ if (!local_user()) { return; } @@ -84,7 +88,8 @@ function theme_admin(App $a) { return frio_form($arr); } -function frio_form($arr) { +function frio_form($arr) +{ require_once("view/theme/frio/php/schema.php"); $scheme_info = get_schema_info($arr["schema"]); @@ -106,7 +111,7 @@ function frio_form($arr) { } } - $background_image_help = "" . L10n::t("Note"). ": ".L10n::t("Check image permissions if all users are allowed to visit the image"); + $background_image_help = "" . L10n::t("Note") . ": " . L10n::t("Check image permissions if all users are allowed to visit the image"); $t = get_markup_template('theme_settings.tpl'); $ctx = [ @@ -123,13 +128,13 @@ function frio_form($arr) { '$bg_image_options' => Image::get_options($arr), ]; - if (array_key_exists("login_bg_image", $arr) && !array_key_exists("login_bg_image", $disable)) { - $ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false]; - } - if (array_key_exists("login_bg_color", $arr) && !array_key_exists("login_bg_color", $disable)) { - $ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false]; + if (array_key_exists("login_bg_image", $arr) && !array_key_exists("login_bg_image", $disable)) { + $ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false]; } + if (array_key_exists("login_bg_color", $arr) && !array_key_exists("login_bg_color", $disable)) { + $ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false]; + } $o = replace_macros($t, $ctx); diff --git a/view/theme/frio/php/Image.php b/view/theme/frio/php/Image.php index 2dc0345c7b..f68e9cf077 100644 --- a/view/theme/frio/php/Image.php +++ b/view/theme/frio/php/Image.php @@ -21,14 +21,10 @@ class Image public static function get_options($arr) { $bg_image_options = [ - 'repeat' => [ - 'frio_bg_image_option', L10n::t("Repeat the image"), "repeat", L10n::t("Will repeat your image to fill the background."), ($arr["bg_image_option"] == "repeat")], - 'stretch' => [ - 'frio_bg_image_option', L10n::t("Stretch"), "stretch", L10n::t("Will stretch to width/height of the image."), ($arr["bg_image_option"] == "stretch")], - 'cover' => [ - 'frio_bg_image_option', L10n::t("Resize fill and-clip"), "cover", L10n::t("Resize to fill and retain aspect ratio."), ($arr["bg_image_option"] == "cover")], - 'contain' => [ - 'frio_bg_image_option', L10n::t("Resize best fit"), "contain", L10n::t("Resize to best fit and retain aspect ratio."), ($arr["bg_image_option"] == "contain")], + 'repeat' => ['frio_bg_image_option', L10n::t("Repeat the image"), "repeat", L10n::t("Will repeat your image to fill the background."), ($arr["bg_image_option"] == "repeat")], + 'stretch' => ['frio_bg_image_option', L10n::t("Stretch"), "stretch", L10n::t("Will stretch to width/height of the image."), ($arr["bg_image_option"] == "stretch")], + 'cover' => ['frio_bg_image_option', L10n::t("Resize fill and-clip"), "cover", L10n::t("Resize to fill and retain aspect ratio."), ($arr["bg_image_option"] == "cover")], + 'contain' => ['frio_bg_image_option', L10n::t("Resize best fit"), "contain", L10n::t("Resize to best fit and retain aspect ratio."), ($arr["bg_image_option"] == "contain")], ]; return $bg_image_options; diff --git a/view/theme/frio/php/schema.php b/view/theme/frio/php/schema.php index 83aad53b7e..1c959044de 100644 --- a/view/theme/frio/php/schema.php +++ b/view/theme/frio/php/schema.php @@ -1,6 +1,5 @@ Schema version * 'overwrites' => Variables which overwriting custom settings */ - use Friendica\Core\PConfig; -function get_schema_info($schema){ - +function get_schema_info($schema) +{ $theme = current_theme(); $themepath = "view/theme/" . $theme . "/"; - $schema = PConfig::get(local_user(),'frio', 'schema'); + $schema = PConfig::get(local_user(), 'frio', 'schema'); - $info=[ + $info = [ 'name' => $schema, 'description' => "", 'author' => [], @@ -41,34 +39,33 @@ function get_schema_info($schema){ $r = preg_match("|/\*.*\*/|msU", $f, $m); - if ($r){ + if ($r) { $ll = explode("\n", $m[0]); - foreach( $ll as $l ) { - $l = trim($l,"\t\n\r */"); - if ($l!=""){ - list($k,$v) = array_map("trim", explode(":",$l,2)); - $k= strtolower($k); - if ($k=="author"){ - $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m); + foreach ($ll as $l) { + $l = trim($l, "\t\n\r */"); + if ($l != "") { + list($k, $v) = array_map("trim", explode(":", $l, 2)); + $k = strtolower($k); + if ($k == "author") { + $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); if ($r) { - $info['author'][] = ['name'=>$m[1], 'link'=>$m[2]]; + $info['author'][] = ['name' => $m[1], 'link' => $m[2]]; } else { - $info['author'][] = ['name'=>$v]; + $info['author'][] = ['name' => $v]; } } elseif ($k == "overwrites") { - $theme_settings = explode(',',str_replace(' ','', $v)); + $theme_settings = explode(',', str_replace(' ', '', $v)); foreach ($theme_settings as $key => $value) { $info["overwrites"][$value] = true; } } else { - if (array_key_exists($k,$info)){ - $info[$k]=$v; + if (array_key_exists($k, $info)) { + $info[$k] = $v; } } - } } - } + return $info; } diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php index 044f2ab61c..b2ddb3fe25 100644 --- a/view/theme/frio/style.php +++ b/view/theme/frio/style.php @@ -84,7 +84,7 @@ if (($schema) && ($schema != '---')) { // If we haven't got a schema, load the default. We shouldn't touch this - we // should leave it for admins to define for themselves. // default.php and default.css MUST be symlinks to existing schema files. -if (! $schema) { +if (!$schema) { if (file_exists('view/theme/frio/schema/default.php')) { $schemefile = 'view/theme/frio/schema/default.php'; require_once $schemefile; @@ -102,15 +102,14 @@ $link_color = (empty($link_color) ? "#6fdbe8" : $link_color); $bgcolor = (empty($bgcolor) ? "#ededed" : $bgcolor); // The background image can not be empty. So we use a dummy jpg if no image was set. $background_image = (empty($background_image) ? 'img/none.jpg' : $background_image); -$modified = (empty($modified) ? time() :$modified); +$modified = (empty($modified) ? time() : $modified); // set a default login bg image if no custom image and no custom bg color are set. if (empty($login_bg_image) && empty($login_bg_color)) { - $login_bg_image = (empty($login_bg_image) ? 'img/login_bg.jpg' : $login_bg_image); + $login_bg_image = 'img/login_bg.jpg'; } -$login_bg_color = (empty($login_bg_color) ? "#ededed" : $login_bg_color); - +$login_bg_color = (empty($login_bg_color) ? "#ededed" : $login_bg_color); $contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100); @@ -158,7 +157,7 @@ switch ($bg_image_option) { $background_size_img = "100%"; break; case "cover": - $background_size_img ="cover"; + $background_size_img = "cover"; break; case "repeat": $background_size_img = "auto"; @@ -175,7 +174,7 @@ switch ($bg_image_option) { // Convert transparency level from percentage to opacity value. $contentbg_transp = $contentbg_transp / 100; -$options = [ +$options = [ '$nav_bg' => $nav_bg, '$nav_icon_color' => $nav_icon_color, '$nav_icon_hover_color' => $nav_icon_hover_color, @@ -214,8 +213,8 @@ $etag = md5($css); // Set a header for caching. header('Cache-Control: public'); -header('ETag: "'.$etag.'"'); -header('Last-Modified: '.$modified); +header('ETag: "' . $etag . '"'); +header('Last-Modified: ' . $modified); // Only send the CSS file if it was changed. if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) { From eb9b832c3ab2accd8d12aa50c00c18dc1316edae Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:12:43 -0400 Subject: [PATCH 09/23] [frio] Normalize quoting style in PHP files --- view/theme/frio/config.php | 104 +++++++++++++++---------------- view/theme/frio/php/Image.php | 8 +-- view/theme/frio/php/schema.php | 24 +++---- view/theme/frio/php/standard.php | 2 +- view/theme/frio/style.php | 76 +++++++++++----------- view/theme/frio/theme.php | 92 +++++++++++++-------------- 6 files changed, 153 insertions(+), 153 deletions(-) diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 2827919f9d..05fcd3f9e0 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -15,14 +15,14 @@ function theme_post(App $a) } if (isset($_POST['frio-settings-submit'])) { - PConfig::set(local_user(), 'frio', 'schema', $_POST["frio_schema"]); - PConfig::set(local_user(), 'frio', 'nav_bg', $_POST["frio_nav_bg"]); - PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST["frio_nav_icon_color"]); - PConfig::set(local_user(), 'frio', 'link_color', $_POST["frio_link_color"]); - PConfig::set(local_user(), 'frio', 'background_color', $_POST["frio_background_color"]); - PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST["frio_contentbg_transp"]); - PConfig::set(local_user(), 'frio', 'background_image', $_POST["frio_background_image"]); - PConfig::set(local_user(), 'frio', 'bg_image_option', $_POST["frio_bg_image_option"]); + PConfig::set(local_user(), 'frio', 'schema', $_POST['frio_schema']); + PConfig::set(local_user(), 'frio', 'nav_bg', $_POST['frio_nav_bg']); + PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST['frio_nav_icon_color']); + PConfig::set(local_user(), 'frio', 'link_color', $_POST['frio_link_color']); + PConfig::set(local_user(), 'frio', 'background_color', $_POST['frio_background_color']); + PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp']); + PConfig::set(local_user(), 'frio', 'background_image', $_POST['frio_background_image']); + PConfig::set(local_user(), 'frio', 'bg_image_option', $_POST['frio_bg_image_option']); PConfig::set(local_user(), 'frio', 'css_modified', time()); } } @@ -34,16 +34,16 @@ function theme_admin_post(App $a) } if (isset($_POST['frio-settings-submit'])) { - Config::set('frio', 'schema', $_POST["frio_schema"]); - Config::set('frio', 'nav_bg', $_POST["frio_nav_bg"]); - Config::set('frio', 'nav_icon_color', $_POST["frio_nav_icon_color"]); - Config::set('frio', 'link_color', $_POST["frio_link_color"]); - Config::set('frio', 'background_color', $_POST["frio_background_color"]); - Config::set('frio', 'contentbg_transp', $_POST["frio_contentbg_transp"]); - Config::set('frio', 'background_image', $_POST["frio_background_image"]); - Config::set('frio', 'bg_image_option', $_POST["frio_bg_image_option"]); - Config::set('frio', 'login_bg_image', $_POST["frio_login_bg_image"]); - Config::set('frio', 'login_bg_color', $_POST["frio_login_bg_color"]); + Config::set('frio', 'schema', $_POST['frio_schema']); + Config::set('frio', 'nav_bg', $_POST['frio_nav_bg']); + Config::set('frio', 'nav_icon_color', $_POST['frio_nav_icon_color']); + Config::set('frio', 'link_color', $_POST['frio_link_color']); + Config::set('frio', 'background_color', $_POST['frio_background_color']); + Config::set('frio', 'contentbg_transp', $_POST['frio_contentbg_transp']); + Config::set('frio', 'background_image', $_POST['frio_background_image']); + Config::set('frio', 'bg_image_option', $_POST['frio_bg_image_option']); + Config::set('frio', 'login_bg_image', $_POST['frio_login_bg_image']); + Config::set('frio', 'login_bg_color', $_POST['frio_login_bg_color']); Config::set('frio', 'css_modified', time()); } } @@ -55,14 +55,14 @@ function theme_content(App $a) } $arr = []; - $arr["schema"] = PConfig::get(local_user(), 'frio', 'schema'); - $arr["nav_bg"] = PConfig::get(local_user(), 'frio', 'nav_bg'); - $arr["nav_icon_color"] = PConfig::get(local_user(), 'frio', 'nav_icon_color'); - $arr["link_color"] = PConfig::get(local_user(), 'frio', 'link_color'); - $arr["bgcolor"] = PConfig::get(local_user(), 'frio', 'background_color'); - $arr["contentbg_transp"] = PConfig::get(local_user(), 'frio', 'contentbg_transp'); - $arr["background_image"] = PConfig::get(local_user(), 'frio', 'background_image'); - $arr["bg_image_option"] = PConfig::get(local_user(), 'frio', 'bg_image_option'); + $arr['schema'] = PConfig::get(local_user(), 'frio', 'schema'); + $arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg'); + $arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color'); + $arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color'); + $arr['bgcolor'] = PConfig::get(local_user(), 'frio', 'background_color'); + $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp'); + $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image'); + $arr['bg_image_option'] = PConfig::get(local_user(), 'frio', 'bg_image_option'); return frio_form($arr); } @@ -74,36 +74,36 @@ function theme_admin(App $a) } $arr = []; - $arr["schema"] = Config::get('frio', 'schema'); - $arr["nav_bg"] = Config::get('frio', 'nav_bg'); - $arr["nav_icon_color"] = Config::get('frio', 'nav_icon_color'); - $arr["link_color"] = Config::get('frio', 'link_color'); - $arr["bgcolor"] = Config::get('frio', 'background_color'); - $arr["contentbg_transp"] = Config::get('frio', 'contentbg_transp'); - $arr["background_image"] = Config::get('frio', 'background_image'); - $arr["bg_image_option"] = Config::get('frio', 'bg_image_option'); - $arr["login_bg_image"] = Config::get('frio', 'login_bg_image'); - $arr["login_bg_color"] = Config::get('frio', 'login_bg_color'); + $arr['schema'] = Config::get('frio', 'schema'); + $arr['nav_bg'] = Config::get('frio', 'nav_bg'); + $arr['nav_icon_color'] = Config::get('frio', 'nav_icon_color'); + $arr['link_color'] = Config::get('frio', 'link_color'); + $arr['bgcolor'] = Config::get('frio', 'background_color'); + $arr['contentbg_transp'] = Config::get('frio', 'contentbg_transp'); + $arr['background_image'] = Config::get('frio', 'background_image'); + $arr['bg_image_option'] = Config::get('frio', 'bg_image_option'); + $arr['login_bg_image'] = Config::get('frio', 'login_bg_image'); + $arr['login_bg_color'] = Config::get('frio', 'login_bg_color'); return frio_form($arr); } function frio_form($arr) { - require_once("view/theme/frio/php/schema.php"); + require_once 'view/theme/frio/php/schema.php'; - $scheme_info = get_schema_info($arr["schema"]); - $disable = $scheme_info["overwrites"]; + $scheme_info = get_schema_info($arr['schema']); + $disable = $scheme_info['overwrites']; if (!is_array($disable)) { $disable = []; } $scheme_choices = []; - $scheme_choices["---"] = L10n::t("Default"); + $scheme_choices['---'] = L10n::t('Default'); $files = glob('view/theme/frio/schema/*.php'); if ($files) { foreach ($files as $file) { - $f = basename($file, ".php"); + $f = basename($file, '.php'); if ($f != 'default') { $scheme_name = $f; $scheme_choices[$f] = $scheme_name; @@ -111,28 +111,28 @@ function frio_form($arr) } } - $background_image_help = "" . L10n::t("Note") . ": " . L10n::t("Check image permissions if all users are allowed to visit the image"); + $background_image_help = '' . L10n::t('Note') . ': ' . L10n::t('Check image permissions if all users are allowed to visit the image'); $t = get_markup_template('theme_settings.tpl'); $ctx = [ '$submit' => L10n::t('Submit'), '$baseurl' => System::baseUrl(), - '$title' => L10n::t("Theme settings"), - '$schema' => ['frio_schema', L10n::t("Select scheme"), $arr["schema"], '', $scheme_choices], - '$nav_bg' => array_key_exists("nav_bg", $disable) ? "" : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], - '$nav_icon_color' => array_key_exists("nav_icon_color", $disable) ? "" : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], - '$link_color' => array_key_exists("link_color", $disable) ? "" : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], - '$bgcolor' => array_key_exists("bgcolor", $disable) ? "" : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false], - '$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : ['frio_contentbg_transp', L10n::t("Content background opacity"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100), ''], - '$background_image' => array_key_exists("background_image", $disable) ? "" : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], + '$title' => L10n::t('Theme settings'), + '$schema' => ['frio_schema', L10n::t('Select scheme'), $arr['schema'], '', $scheme_choices], + '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], + '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], + '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], + '$bgcolor' => array_key_exists('bgcolor', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false], + '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), ((isset($arr['contentbg_transp']) && $arr['contentbg_transp'] != '') ? $arr['contentbg_transp'] : 100), ''], + '$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], '$bg_image_options' => Image::get_options($arr), ]; - if (array_key_exists("login_bg_image", $arr) && !array_key_exists("login_bg_image", $disable)) { + if (array_key_exists('login_bg_image', $arr) && !array_key_exists('login_bg_image', $disable)) { $ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false]; } - if (array_key_exists("login_bg_color", $arr) && !array_key_exists("login_bg_color", $disable)) { + if (array_key_exists('login_bg_color', $arr) && !array_key_exists('login_bg_color', $disable)) { $ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false]; } diff --git a/view/theme/frio/php/Image.php b/view/theme/frio/php/Image.php index f68e9cf077..2b3cf3be8c 100644 --- a/view/theme/frio/php/Image.php +++ b/view/theme/frio/php/Image.php @@ -21,10 +21,10 @@ class Image public static function get_options($arr) { $bg_image_options = [ - 'repeat' => ['frio_bg_image_option', L10n::t("Repeat the image"), "repeat", L10n::t("Will repeat your image to fill the background."), ($arr["bg_image_option"] == "repeat")], - 'stretch' => ['frio_bg_image_option', L10n::t("Stretch"), "stretch", L10n::t("Will stretch to width/height of the image."), ($arr["bg_image_option"] == "stretch")], - 'cover' => ['frio_bg_image_option', L10n::t("Resize fill and-clip"), "cover", L10n::t("Resize to fill and retain aspect ratio."), ($arr["bg_image_option"] == "cover")], - 'contain' => ['frio_bg_image_option', L10n::t("Resize best fit"), "contain", L10n::t("Resize to best fit and retain aspect ratio."), ($arr["bg_image_option"] == "contain")], + 'repeat' => ['frio_bg_image_option', L10n::t('Repeat the image'), 'repeat', L10n::t('Will repeat your image to fill the background.'), ($arr['bg_image_option'] == 'repeat')], + 'stretch' => ['frio_bg_image_option', L10n::t('Stretch'), 'stretch', L10n::t('Will stretch to width/height of the image.'), ($arr['bg_image_option'] == 'stretch')], + 'cover' => ['frio_bg_image_option', L10n::t('Resize fill and-clip'), 'cover', L10n::t('Resize to fill and retain aspect ratio.'), ($arr['bg_image_option'] == 'cover')], + 'contain' => ['frio_bg_image_option', L10n::t('Resize best fit'), 'contain', L10n::t('Resize to best fit and retain aspect ratio.'), ($arr['bg_image_option'] == 'contain')], ]; return $bg_image_options; diff --git a/view/theme/frio/php/schema.php b/view/theme/frio/php/schema.php index 1c959044de..29ad00e044 100644 --- a/view/theme/frio/php/schema.php +++ b/view/theme/frio/php/schema.php @@ -22,41 +22,41 @@ use Friendica\Core\PConfig; function get_schema_info($schema) { $theme = current_theme(); - $themepath = "view/theme/" . $theme . "/"; + $themepath = 'view/theme/' . $theme . '/'; $schema = PConfig::get(local_user(), 'frio', 'schema'); $info = [ 'name' => $schema, - 'description' => "", + 'description' => '', 'author' => [], - 'version' => "", + 'version' => '', 'overwrites' => [] ]; - if (!is_file($themepath . "schema/" . $schema . ".php")) return $info; + if (!is_file($themepath . 'schema/' . $schema . '.php')) return $info; - $f = file_get_contents($themepath . "schema/" . $schema . ".php"); + $f = file_get_contents($themepath . 'schema/' . $schema . '.php'); - $r = preg_match("|/\*.*\*/|msU", $f, $m); + $r = preg_match('|/\*.*\*/|msU', $f, $m); if ($r) { $ll = explode("\n", $m[0]); foreach ($ll as $l) { $l = trim($l, "\t\n\r */"); - if ($l != "") { - list($k, $v) = array_map("trim", explode(":", $l, 2)); + if ($l != '') { + list($k, $v) = array_map('trim', explode(':', $l, 2)); $k = strtolower($k); - if ($k == "author") { - $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m); + if ($k == 'author') { + $r = preg_match('|([^<]+)<([^>]+)>|', $v, $m); if ($r) { $info['author'][] = ['name' => $m[1], 'link' => $m[2]]; } else { $info['author'][] = ['name' => $v]; } - } elseif ($k == "overwrites") { + } elseif ($k == 'overwrites') { $theme_settings = explode(',', str_replace(' ', '', $v)); foreach ($theme_settings as $key => $value) { - $info["overwrites"][$value] = true; + $info['overwrites'][$value] = true; } } else { if (array_key_exists($k, $info)) { diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php index edfec573b0..64c4544cd8 100644 --- a/view/theme/frio/php/standard.php +++ b/view/theme/frio/php/standard.php @@ -16,7 +16,7 @@ -"; + Skip to main content module !== 'install') { PConfig::load($uid, 'frio'); // Load the profile owners pconfig. - $schema = PConfig::get($uid, "frio", "schema"); - $nav_bg = PConfig::get($uid, "frio", "nav_bg"); - $nav_icon_color = PConfig::get($uid, "frio", "nav_icon_color"); - $link_color = PConfig::get($uid, "frio", "link_color"); - $bgcolor = PConfig::get($uid, "frio", "background_color"); - $contentbg_transp = PConfig::get($uid, "frio", "contentbg_transp"); - $background_image = PConfig::get($uid, "frio", "background_image"); - $bg_image_option = PConfig::get($uid, "frio", "bg_image_option"); - $modified = PConfig::get($uid, "frio", "css_modified"); + $schema = PConfig::get($uid, 'frio', 'schema'); + $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); + $nav_icon_color = PConfig::get($uid, 'frio', 'nav_icon_color'); + $link_color = PConfig::get($uid, 'frio', 'link_color'); + $bgcolor = PConfig::get($uid, 'frio', 'background_color'); + $contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp'); + $background_image = PConfig::get($uid, 'frio', 'background_image'); + $bg_image_option = PConfig::get($uid, 'frio', 'bg_image_option'); + $modified = PConfig::get($uid, 'frio', 'css_modified'); // There is maybe the case that the user did never modify the theme settings. // In this case we store the present time. @@ -38,17 +38,17 @@ if ($a->module !== 'install') { Config::load('frio'); // Load frios system config. - $schema = Config::get("frio", "schema"); - $nav_bg = Config::get("frio", "nav_bg"); - $nav_icon_color = Config::get("frio", "nav_icon_color"); - $link_color = Config::get("frio", "link_color"); - $bgcolor = Config::get("frio", "background_color"); - $contentbg_transp = Config::get("frio", "contentbg_transp"); - $background_image = Config::get("frio", "background_image"); - $bg_image_option = Config::get("frio", "bg_image_option"); - $login_bg_image = Config::get("frio", "login_bg_image"); - $login_bg_color = Config::get("frio", "login_bg_color"); - $modified = Config::get("frio", "css_modified"); + $schema = Config::get('frio', 'schema'); + $nav_bg = Config::get('frio', 'nav_bg'); + $nav_icon_color = Config::get('frio', 'nav_icon_color'); + $link_color = Config::get('frio', 'link_color'); + $bgcolor = Config::get('frio', 'background_color'); + $contentbg_transp = Config::get('frio', 'contentbg_transp'); + $background_image = Config::get('frio', 'background_image'); + $bg_image_option = Config::get('frio', 'bg_image_option'); + $login_bg_image = Config::get('frio', 'login_bg_image'); + $login_bg_color = Config::get('frio', 'login_bg_color'); + $modified = Config::get('frio', 'css_modified'); // There is maybe the case that the user did never modify the theme settings. // In this case we store the present time. @@ -68,7 +68,7 @@ if (x($_REQUEST, 'schema')) { } // Sanitize the data. -$schema = !empty($schema) ? basename($schema) : ""; +$schema = !empty($schema) ? basename($schema) : ''; if (($schema) && ($schema != '---')) { @@ -96,10 +96,10 @@ if (!$schema) { //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. -$nav_bg = (empty($nav_bg) ? "#708fa0" : $nav_bg); -$nav_icon_color = (empty($nav_icon_color) ? "#fff" : $nav_icon_color); -$link_color = (empty($link_color) ? "#6fdbe8" : $link_color); -$bgcolor = (empty($bgcolor) ? "#ededed" : $bgcolor); +$nav_bg = (empty($nav_bg) ? '#708fa0' : $nav_bg); +$nav_icon_color = (empty($nav_icon_color) ? '#fff' : $nav_icon_color); +$link_color = (empty($link_color) ? '#6fdbe8' : $link_color); +$bgcolor = (empty($bgcolor) ? '#ededed' : $bgcolor); // The background image can not be empty. So we use a dummy jpg if no image was set. $background_image = (empty($background_image) ? 'img/none.jpg' : $background_image); $modified = (empty($modified) ? time() : $modified); @@ -109,9 +109,9 @@ $modified = (empty($modified) ? time() : $modified); if (empty($login_bg_image) && empty($login_bg_color)) { $login_bg_image = 'img/login_bg.jpg'; } -$login_bg_color = (empty($login_bg_color) ? "#ededed" : $login_bg_color); +$login_bg_color = (empty($login_bg_color) ? '#ededed' : $login_bg_color); -$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100); +$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != '') ? $contentbg_transp : 100); // Calculate some colors in dependance of existing colors. // Some colors are calculated to don't have too many selection @@ -153,21 +153,21 @@ if (!isset($bg_image_option)) { $bg_image_option = null; } switch ($bg_image_option) { - case "stretch": - $background_size_img = "100%"; + case 'stretch': + $background_size_img = '100%'; break; - case "cover": - $background_size_img = "cover"; + case 'cover': + $background_size_img = 'cover'; break; - case "repeat": - $background_size_img = "auto"; + case 'repeat': + $background_size_img = 'auto'; break; - case "contain": - $background_size_img = "contain"; + case 'contain': + $background_size_img = 'contain'; break; default: - $background_size_img = "auto"; + $background_size_img = 'auto'; break; } @@ -219,7 +219,7 @@ header('Last-Modified: ' . $modified); // Only send the CSS file if it was changed. 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"], ['', ''], + $cached_etag = str_replace(['"', '-gzip'], ['', ''], stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])); if (($cached_modified == $modified) && ($cached_etag == $etag)) { diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 74b1577ddf..4f5756caf9 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -18,7 +18,7 @@ use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Profile; -$frio = "view/theme/frio"; +$frio = 'view/theme/frio'; global $frio; @@ -34,21 +34,21 @@ function frio_init(App $a) $style = PConfig::get(local_user(), 'frio', 'style'); - $frio = "view/theme/frio"; + $frio = 'view/theme/frio'; global $frio; // if the device is a mobile device set js is_mobile // variable so the js scripts can use this information if ($a->is_mobile || $a->is_tablet) { - $a->page["htmlhead"] .= <<< EOT + $a->page['htmlhead'] .= <<< EOT EOT; } - if ($style == "") { + if ($style == '') { $style = Config::get('frio', 'style'); } } @@ -62,7 +62,7 @@ function frio_install() Addon::registerHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); Addon::registerHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item'); - logger("installed theme frio"); + logger('installed theme frio'); } function frio_uninstall() @@ -74,7 +74,7 @@ function frio_uninstall() Addon::unregisterHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); Addon::unregisterHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item'); - logger("uninstalled theme frio"); + logger('uninstalled theme frio'); } /** @@ -92,26 +92,26 @@ function frio_uninstall() function frio_item_photo_links(App $a, &$body_info) { $occurence = 0; - $p = Plaintext::getBoundariesPosition($body_info['html'], ""); + $p = Plaintext::getBoundariesPosition($body_info['html'], ''); while ($p !== false && ($occurence++ < 500)) { $link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']); $matches = []; - preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches); + preg_match('/\/photos\/[\w]+\/image\/([\w]+)/', $link, $matches); if ($matches) { // Replace the link for the photo's page with a direct link to the photo itself $newlink = str_replace($matches[0], "/photo/{$matches[1]}", $link); // Add a "quiet" parameter to any redir links to prevent the "XX welcomes YY" info boxes - $newlink = preg_replace("/href=\"([^\"]+)\/redir\/([^\"]+)&url=([^\"]+)\"/", 'href="$1/redir/$2&quiet=1&url=$3"', $newlink); + $newlink = preg_replace('/href="([^"]+)\/redir\/([^"]+)&url=([^"]+)"/', 'href="$1/redir/$2&quiet=1&url=$3"', $newlink); // Having any arguments to the link for Colorbox causes it to fetch base64 code instead of the image - $newlink = preg_replace("/\/[?&]zrl=([^&\"]+)/", '', $newlink); + $newlink = preg_replace('/\/[?&]zrl=([^&"]+)/', '', $newlink); $body_info['html'] = str_replace($link, $newlink, $body_info['html']); } - $p = Plaintext::getBoundariesPosition($body_info['html'], "", $occurence); + $p = Plaintext::getBoundariesPosition($body_info['html'], '', $occurence); } } @@ -127,10 +127,10 @@ function frio_item_photo_links(App $a, &$body_info) */ function frio_item_photo_menu(App $a, &$arr) { - foreach ($arr["menu"] as $k => $v) { + foreach ($arr['menu'] as $k => $v) { if (strpos($v, 'poke/?f=&c=') === 0 || strpos($v, 'message/new/') === 0) { - $v = "javascript:addToModal('" . $v . "'); return false;"; - $arr["menu"][$k] = $v; + $v = 'javascript:addToModal(\'' . $v . '\'); return false;'; + $arr['menu'][$k] = $v; } } } @@ -149,9 +149,9 @@ function frio_item_photo_menu(App $a, &$arr) */ function frio_contact_photo_menu(App $a, &$args) { - $cid = $args["contact"]["id"]; - $pokelink = $args["menu"]["poke"][1]; - $pmlink = $args["menu"]["pm"][1]; + $cid = $args['contact']['id']; + $pokelink = $args['menu']['poke'][1]; + $pmlink = $args['menu']['pm'][1]; // Set the the indicator for opening the status, profile and photo pages // in a new tab to false if the contact a dfrn (friendica) contact @@ -160,12 +160,12 @@ function frio_contact_photo_menu(App $a, &$args) // friendica servers as remote user or visitor // // The value for opening in a new tab is e.g. when - // $args["menu"]["status"][2] is true. If the value of the [2] key is true + // $args['menu']['status'][2] is true. If the value of the [2] key is true // and if it's a friendica contact we set it to false - foreach ($args["menu"] as $k => $v) { - if ($k === "status" || $k === "profile" || $k === "photos") { - $v[2] = (($args["contact"]["network"] === "dfrn") ? false : true); - $args["menu"][$k][2] = $v[2]; + foreach ($args['menu'] as $k => $v) { + if ($k === 'status' || $k === 'profile' || $k === 'photos') { + $v[2] = (($args['contact']['network'] === 'dfrn') ? false : true); + $args['menu'][$k][2] = $v[2]; } } @@ -173,11 +173,11 @@ function frio_contact_photo_menu(App $a, &$args) // Later we can make conditions in the corresponing templates (e.g. // contact_template.tpl) if (strpos($pokelink, 'poke/?f=&c=' . $cid) !== false) { - $args["menu"]["poke"][3] = "modal"; + $args['menu']['poke'][3] = 'modal'; } if (strpos($pmlink, 'message/new/' . $cid) !== false) { - $args["menu"]["pm"][3] = "modal"; + $args['menu']['pm'][3] = 'modal'; } } @@ -231,43 +231,43 @@ function frio_remote_nav($a, &$nav) // user info $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid'])); - $r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"); + $r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg'); $r[0]['name'] = $a->user['username']; } elseif (!local_user() && remote_user()) { $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); - $nav['remote'] = L10n::t("Guest"); + $nav['remote'] = L10n::t('Guest'); } elseif (Profile::getMyURL()) { $r = q("SELECT `name`, `nick`, `photo` FROM `gcontact` WHERE `addr` = '%s' AND `network` = 'dfrn'", dbesc($webbie)); - $nav['remote'] = L10n::t("Visitor"); + $nav['remote'] = L10n::t('Visitor'); } else { $r = false; } if (DBM::is_result($r)) { $nav['userinfo'] = [ - 'icon' => (DBM::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"), + 'icon' => (DBM::is_result($r) ? $r[0]['photo'] : 'images/person-48.jpg'), 'name' => $r[0]['name'], ]; } if (!local_user() && !empty($server_url)) { - $nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), "", L10n::t('End this session')]; + $nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')]; // user menu - $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), "", L10n::t('Your posts and conversations')]; - $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), "", L10n::t('Your profile page')]; - $nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), "", L10n::t('Your photos')]; - $nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), "", L10n::t('Your videos')]; - $nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), "", L10n::t('Your events')]; + $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')]; + $nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')]; + $nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), '', L10n::t('Your photos')]; + $nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')]; + $nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), '', L10n::t('Your events')]; // navbar links - $nav['network'] = [$server_url . '/network', L10n::t('Network'), "", L10n::t('Conversations from your friends')]; - $nav['events'] = [$server_url . '/events', L10n::t('Events'), "", L10n::t('Events and Calendar')]; - $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), "", L10n::t('Private mail')]; - $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), "", L10n::t('Account settings')]; - $nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), "", L10n::t('Manage/edit friends and contacts')]; + $nav['network'] = [$server_url . '/network', L10n::t('Network'), '', L10n::t('Conversations from your friends')]; + $nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')]; + $nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')]; + $nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')]; + $nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; $nav['sitename'] = $a->config['sitename']; } } @@ -289,17 +289,17 @@ function frio_acl_lookup(App $a, &$results) { require_once 'mod/contacts.php'; - $nets = x($_GET, "nets") ? notags(trim($_GET["nets"])) : ""; + $nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : ''; // we introduce a new search type, r should do the same query like it's // done in /mod/contacts for connections - if ($results["type"] !== "r") { + if ($results['type'] !== 'r') { return; } $sql_extra = ''; - if ($results["search"]) { - $search_txt = dbesc(protect_sprintf(preg_quote($results["search"]))); + if ($results['search']) { + $search_txt = dbesc(protect_sprintf(preg_quote($results['search']))); $sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') "; } @@ -311,7 +311,7 @@ function frio_acl_lookup(App $a, &$results) $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid'])); if (DBM::is_result($r)) { - $total = $r[0]["total"]; + $total = $r[0]['total']; } $sql_extra3 = Widget::unavailableNetworks(); @@ -328,8 +328,8 @@ function frio_acl_lookup(App $a, &$results) } } - $results["items"] = $contacts; - $results["tot"] = $total; + $results['items'] = $contacts; + $results['tot'] = $total; } /** From 3bfa6facfc1294707368877d68caed50cbedf064 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:26:14 -0400 Subject: [PATCH 10/23] [frio] Fix typo schema -> scheme --- view/theme/frio/README.md | 8 ++-- view/theme/frio/config.php | 16 +++---- ...c.png => screenshot-scheme-love-music.png} | Bin ...hema-red.png => screenshot-scheme-red.png} | Bin view/theme/frio/php/default.php | 8 ++-- .../theme/frio/php/{schema.php => scheme.php} | 26 ++++++------ view/theme/frio/scheme/blue.php | 16 +++++++ .../frio/{schema => scheme}/love-music.css | 0 .../frio/{schema => scheme}/love-music.php | 4 +- view/theme/frio/{schema => scheme}/red.php | 6 +-- view/theme/frio/style.php | 40 +++++++++--------- view/theme/frio/templates/theme_settings.tpl | 2 +- 12 files changed, 71 insertions(+), 55 deletions(-) rename view/theme/frio/img/screenshots/{screenshot-schema-love-music.png => screenshot-scheme-love-music.png} (100%) rename view/theme/frio/img/screenshots/{screenshot-schema-red.png => screenshot-scheme-red.png} (100%) rename view/theme/frio/php/{schema.php => scheme.php} (67%) create mode 100644 view/theme/frio/scheme/blue.php rename view/theme/frio/{schema => scheme}/love-music.css (100%) rename view/theme/frio/{schema => scheme}/love-music.php (60%) rename view/theme/frio/{schema => scheme}/red.php (63%) diff --git a/view/theme/frio/README.md b/view/theme/frio/README.md index 037028ff44..c729d12820 100644 --- a/view/theme/frio/README.md +++ b/view/theme/frio/README.md @@ -37,11 +37,11 @@ Don't blame me too much for ugly code and hacks. Fix it ;-) **Theme - Settings** ![Theme - Settings](https://github.com/rabuzarus/frio/blob/master/img/screenshots/screenshot-settings.png) -**Red schema** -![Red schema](https://github.com/rabuzarus/frio/blob/master/img/screenshots/screenshot-schema-red.png) +**Red scheme** +![Red scheme](https://github.com/rabuzarus/frio/blob/master/img/screenshots/screenshot-scheme-red.png) -**Love Music schema** -![Love Music schema](https://github.com/rabuzarus/frio/blob/master/img/screenshots/screenshot-schema-love-music.png) +**Love Music scheme** +![Love Music scheme](https://github.com/rabuzarus/frio/blob/master/img/screenshots/screenshot-scheme-love-music.png) **frio on mobile** diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 05fcd3f9e0..a3d8d94bdf 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -15,7 +15,7 @@ function theme_post(App $a) } if (isset($_POST['frio-settings-submit'])) { - PConfig::set(local_user(), 'frio', 'schema', $_POST['frio_schema']); + PConfig::set(local_user(), 'frio', 'scheme', $_POST['frio_scheme']); PConfig::set(local_user(), 'frio', 'nav_bg', $_POST['frio_nav_bg']); PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST['frio_nav_icon_color']); PConfig::set(local_user(), 'frio', 'link_color', $_POST['frio_link_color']); @@ -34,7 +34,7 @@ function theme_admin_post(App $a) } if (isset($_POST['frio-settings-submit'])) { - Config::set('frio', 'schema', $_POST['frio_schema']); + Config::set('frio', 'scheme', $_POST['frio_scheme']); Config::set('frio', 'nav_bg', $_POST['frio_nav_bg']); Config::set('frio', 'nav_icon_color', $_POST['frio_nav_icon_color']); Config::set('frio', 'link_color', $_POST['frio_link_color']); @@ -55,7 +55,7 @@ function theme_content(App $a) } $arr = []; - $arr['schema'] = PConfig::get(local_user(), 'frio', 'schema'); + $arr['scheme'] = PConfig::get(local_user(), 'frio', 'scheme'); $arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg'); $arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color'); $arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color'); @@ -74,7 +74,7 @@ function theme_admin(App $a) } $arr = []; - $arr['schema'] = Config::get('frio', 'schema'); + $arr['scheme'] = Config::get('frio', 'scheme'); $arr['nav_bg'] = Config::get('frio', 'nav_bg'); $arr['nav_icon_color'] = Config::get('frio', 'nav_icon_color'); $arr['link_color'] = Config::get('frio', 'link_color'); @@ -90,9 +90,9 @@ function theme_admin(App $a) function frio_form($arr) { - require_once 'view/theme/frio/php/schema.php'; + require_once 'view/theme/frio/php/scheme.php'; - $scheme_info = get_schema_info($arr['schema']); + $scheme_info = get_scheme_info($arr['scheme']); $disable = $scheme_info['overwrites']; if (!is_array($disable)) { $disable = []; @@ -100,7 +100,7 @@ function frio_form($arr) $scheme_choices = []; $scheme_choices['---'] = L10n::t('Default'); - $files = glob('view/theme/frio/schema/*.php'); + $files = glob('view/theme/frio/scheme/*.php'); if ($files) { foreach ($files as $file) { $f = basename($file, '.php'); @@ -118,7 +118,7 @@ function frio_form($arr) '$submit' => L10n::t('Submit'), '$baseurl' => System::baseUrl(), '$title' => L10n::t('Theme settings'), - '$schema' => ['frio_schema', L10n::t('Select scheme'), $arr['schema'], '', $scheme_choices], + '$scheme' => ['frio_scheme', L10n::t('Select scheme'), $arr['scheme'], '', $scheme_choices], '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], diff --git a/view/theme/frio/img/screenshots/screenshot-schema-love-music.png b/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png similarity index 100% rename from view/theme/frio/img/screenshots/screenshot-schema-love-music.png rename to view/theme/frio/img/screenshots/screenshot-scheme-love-music.png diff --git a/view/theme/frio/img/screenshots/screenshot-schema-red.png b/view/theme/frio/img/screenshots/screenshot-scheme-red.png similarity index 100% rename from view/theme/frio/img/screenshots/screenshot-schema-red.png rename to view/theme/frio/img/screenshots/screenshot-scheme-red.png diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index 62b98b79ca..234e1476f9 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -43,10 +43,10 @@ if (!isset($minimal)) { if (is_null($uid)) { $uid = Profile::getThemeUid(); } - $schema = PConfig::get($uid, 'frio', 'schema'); - if (($schema) && ($schema != '---')) { - if (file_exists('view/theme/frio/schema/' . $schema . '.php')) { - $schemefile = 'view/theme/frio/schema/' . $schema . '.php'; + $scheme = PConfig::get($uid, 'frio', 'scheme'); + if (($scheme) && ($scheme != '---')) { + if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) { + $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php'; require_once $schemefile; } } else { diff --git a/view/theme/frio/php/schema.php b/view/theme/frio/php/scheme.php similarity index 67% rename from view/theme/frio/php/schema.php rename to view/theme/frio/php/scheme.php index 29ad00e044..e52f861260 100644 --- a/view/theme/frio/php/schema.php +++ b/view/theme/frio/php/scheme.php @@ -1,41 +1,41 @@ Author Name - * 'description' => Schema description - * 'version' => Schema version + * 'description' => Scheme description + * 'version' => Scheme version * 'overwrites' => Variables which overwriting custom settings */ use Friendica\Core\PConfig; -function get_schema_info($schema) +function get_scheme_info($scheme) { $theme = current_theme(); $themepath = 'view/theme/' . $theme . '/'; - $schema = PConfig::get(local_user(), 'frio', 'schema'); + $scheme = PConfig::get(local_user(), 'frio', 'scheme'); $info = [ - 'name' => $schema, + 'name' => $scheme, 'description' => '', 'author' => [], 'version' => '', 'overwrites' => [] ]; - if (!is_file($themepath . 'schema/' . $schema . '.php')) return $info; + if (!is_file($themepath . 'scheme/' . $scheme . '.php')) return $info; - $f = file_get_contents($themepath . 'schema/' . $schema . '.php'); + $f = file_get_contents($themepath . 'scheme/' . $scheme . '.php'); $r = preg_match('|/\*.*\*/|msU', $f, $m); diff --git a/view/theme/frio/scheme/blue.php b/view/theme/frio/scheme/blue.php new file mode 100644 index 0000000000..bd98ad6a5a --- /dev/null +++ b/view/theme/frio/scheme/blue.php @@ -0,0 +1,16 @@ +module !== 'install') { PConfig::load($uid, 'frio'); // Load the profile owners pconfig. - $schema = PConfig::get($uid, 'frio', 'schema'); + $scheme = PConfig::get($uid, 'frio', 'scheme'); $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); $nav_icon_color = PConfig::get($uid, 'frio', 'nav_icon_color'); $link_color = PConfig::get($uid, 'frio', 'link_color'); @@ -38,7 +38,7 @@ if ($a->module !== 'install') { Config::load('frio'); // Load frios system config. - $schema = Config::get('frio', 'schema'); + $scheme = Config::get('frio', 'scheme'); $nav_bg = Config::get('frio', 'nav_bg'); $nav_icon_color = Config::get('frio', 'nav_icon_color'); $link_color = Config::get('frio', 'link_color'); @@ -59,38 +59,38 @@ if ($a->module !== 'install') { } // Now load the scheme. If a value is changed above, we'll keep the settings -// If not, we'll keep those defined by the schema -// Setting $schema to '' wasn't working for some reason, so we'll check it's +// If not, we'll keep those defined by the scheme +// Setting $scheme to '' wasn't working for some reason, so we'll check it's // not --- like the mobile theme does instead. -// Allow layouts to over-ride the schema. -if (x($_REQUEST, 'schema')) { - $schema = $_REQUEST['schema']; +// Allow layouts to over-ride the scheme. +if (x($_REQUEST, 'scheme')) { + $scheme = $_REQUEST['scheme']; } // Sanitize the data. -$schema = !empty($schema) ? basename($schema) : ''; +$scheme = !empty($scheme) ? basename($scheme) : ''; -if (($schema) && ($schema != '---')) { - if (file_exists('view/theme/frio/schema/' . $schema . '.php')) { - $schemefile = 'view/theme/frio/schema/' . $schema . '.php'; +if (($scheme) && ($scheme != '---')) { + if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) { + $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php'; require_once $schemefile; } - if (file_exists('view/theme/frio/schema/' . $schema . '.css')) { - $schemecssfile = 'view/theme/frio/schema/' . $schema . '.css'; + if (file_exists('view/theme/frio/scheme/' . $scheme . '.css')) { + $schemecssfile = 'view/theme/frio/scheme/' . $scheme . '.css'; } } -// If we haven't got a schema, load the default. We shouldn't touch this - we +// If we haven't got a scheme, load the default. We shouldn't touch this - we // should leave it for admins to define for themselves. -// default.php and default.css MUST be symlinks to existing schema files. -if (!$schema) { - if (file_exists('view/theme/frio/schema/default.php')) { - $schemefile = 'view/theme/frio/schema/default.php'; +// default.php and default.css MUST be symlinks to existing scheme files. +if (!$scheme) { + if (file_exists('view/theme/frio/scheme/default.php')) { + $schemefile = 'view/theme/frio/scheme/default.php'; require_once $schemefile; } - if (file_exists('view/theme/frio/schema/default.css')) { - $schemecssfile = 'view/theme/frio/schema/default.css'; + if (file_exists('view/theme/frio/scheme/default.css')) { + $schemecssfile = 'view/theme/frio/scheme/default.css'; } } diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index adc2150cf9..c88641e74b 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -4,7 +4,7 @@ -{{include file="field_select.tpl" field=$schema}} +{{include file="field_select.tpl" field=$scheme}} {{if $nav_bg}}{{include file="field_colorinput.tpl" field=$nav_bg}}{{/if}} {{if $nav_icon_color}}{{include file="field_colorinput.tpl" field=$nav_icon_color}}{{/if}} From 0f82c3348dccbc9f3ce5023e14d042a4113232ac Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:37:04 -0400 Subject: [PATCH 11/23] [frio] Rename bgcolor to background-color --- view/theme/frio/config.php | 8 ++++---- view/theme/frio/css/style.css | 2 +- view/theme/frio/style.php | 8 ++++---- view/theme/frio/templates/theme_settings.tpl | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index a3d8d94bdf..591901780c 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -59,7 +59,7 @@ function theme_content(App $a) $arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg'); $arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color'); $arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color'); - $arr['bgcolor'] = PConfig::get(local_user(), 'frio', 'background_color'); + $arr['background_color'] = PConfig::get(local_user(), 'frio', 'background_color'); $arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp'); $arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image'); $arr['bg_image_option'] = PConfig::get(local_user(), 'frio', 'bg_image_option'); @@ -78,12 +78,12 @@ function theme_admin(App $a) $arr['nav_bg'] = Config::get('frio', 'nav_bg'); $arr['nav_icon_color'] = Config::get('frio', 'nav_icon_color'); $arr['link_color'] = Config::get('frio', 'link_color'); - $arr['bgcolor'] = Config::get('frio', 'background_color'); + $arr['background_color'] = Config::get('frio', 'background_color'); $arr['contentbg_transp'] = Config::get('frio', 'contentbg_transp'); $arr['background_image'] = Config::get('frio', 'background_image'); $arr['bg_image_option'] = Config::get('frio', 'bg_image_option'); $arr['login_bg_image'] = Config::get('frio', 'login_bg_image'); - $arr['login_bg_color'] = Config::get('frio', 'login_bg_color'); + $arr['login_bg_color'] = Config::get('frio', 'login_bg_color'); return frio_form($arr); } @@ -122,7 +122,7 @@ function frio_form($arr) '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], - '$bgcolor' => array_key_exists('bgcolor', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false], + '$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['background_color'], '', false], '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), ((isset($arr['contentbg_transp']) && $arr['contentbg_transp'] != '') ? $arr['contentbg_transp'] : 100), ''], '$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], '$bg_image_options' => Image::get_options($arr), diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 8a3ca86291..839aa9ac37 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -24,7 +24,7 @@ and open the template in the editor. body { padding-top: 110px; - background-color: $bgcolor; + background-color: $background_color; background-image: url("$background_image"); background-size: $background_size_img; background-attachment: fixed; diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php index f032b89ccc..811db092a2 100644 --- a/view/theme/frio/style.php +++ b/view/theme/frio/style.php @@ -23,7 +23,7 @@ if ($a->module !== 'install') { $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); $nav_icon_color = PConfig::get($uid, 'frio', 'nav_icon_color'); $link_color = PConfig::get($uid, 'frio', 'link_color'); - $bgcolor = PConfig::get($uid, 'frio', 'background_color'); + $background_color = PConfig::get($uid, 'frio', 'background_color'); $contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp'); $background_image = PConfig::get($uid, 'frio', 'background_image'); $bg_image_option = PConfig::get($uid, 'frio', 'bg_image_option'); @@ -42,7 +42,7 @@ if ($a->module !== 'install') { $nav_bg = Config::get('frio', 'nav_bg'); $nav_icon_color = Config::get('frio', 'nav_icon_color'); $link_color = Config::get('frio', 'link_color'); - $bgcolor = Config::get('frio', 'background_color'); + $background_color = Config::get('frio', 'background_color'); $contentbg_transp = Config::get('frio', 'contentbg_transp'); $background_image = Config::get('frio', 'background_image'); $bg_image_option = Config::get('frio', 'bg_image_option'); @@ -99,7 +99,7 @@ if (!$scheme) { $nav_bg = (empty($nav_bg) ? '#708fa0' : $nav_bg); $nav_icon_color = (empty($nav_icon_color) ? '#fff' : $nav_icon_color); $link_color = (empty($link_color) ? '#6fdbe8' : $link_color); -$bgcolor = (empty($bgcolor) ? '#ededed' : $bgcolor); +$background_color = (empty($background_color) ? '#ededed' : $background_color); // The background image can not be empty. So we use a dummy jpg if no image was set. $background_image = (empty($background_image) ? 'img/none.jpg' : $background_image); $modified = (empty($modified) ? time() : $modified); @@ -183,7 +183,7 @@ $options = [ '$menu_background_hover_color' => $menu_background_hover_color, '$btn_primary_color' => $nav_icon_color, '$btn_primary_hover_color' => $menu_background_hover_color, - '$bgcolor' => $bgcolor, + '$background_color' => $background_color, '$contentbg_transp' => $contentbg_transp, '$background_image' => $background_image, '$background_size_img' => $background_size_img, diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index c88641e74b..f524dd6e0e 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -10,7 +10,7 @@ {{if $nav_icon_color}}{{include file="field_colorinput.tpl" field=$nav_icon_color}}{{/if}} {{if $link_color}}{{include file="field_colorinput.tpl" field=$link_color}}{{/if}} -{{if $bgcolor}}{{include file="field_colorinput.tpl" field=$bgcolor}}{{/if}} +{{if $background_color}}{{include file="field_colorinput.tpl" field=$background_color}}{{/if}} {{* The slider for the content opacity - We use no template for this since it is only used at this page *}} {{if $contentbg_transp}} From 4307a87d6affb596f1ee6f4087974aaa9cdeb00f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:40:29 -0400 Subject: [PATCH 12/23] [frio] Rename "Default" color scheme as "Custom" - Capitalize scheme name --- view/theme/frio/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 591901780c..e9594b009b 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -99,13 +99,13 @@ function frio_form($arr) } $scheme_choices = []; - $scheme_choices['---'] = L10n::t('Default'); + $scheme_choices['---'] = L10n::t('Custom'); $files = glob('view/theme/frio/scheme/*.php'); if ($files) { foreach ($files as $file) { $f = basename($file, '.php'); if ($f != 'default') { - $scheme_name = $f; + $scheme_name = ucfirst($f); $scheme_choices[$f] = $scheme_name; } } @@ -118,7 +118,7 @@ function frio_form($arr) '$submit' => L10n::t('Submit'), '$baseurl' => System::baseUrl(), '$title' => L10n::t('Theme settings'), - '$scheme' => ['frio_scheme', L10n::t('Select scheme'), $arr['scheme'], '', $scheme_choices], + '$scheme' => ['frio_scheme', L10n::t('Select color scheme'), $arr['scheme'], '', $scheme_choices], '$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false], '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], From 86e4690b5f4c5e8ac765b034c1ef25ef4a1669c6 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 24 Apr 2018 20:42:23 -0400 Subject: [PATCH 13/23] [frio] Add background-repeat attribute to background image options - Update background image options names and labels - Add background image option label tag --- view/theme/frio/config.php | 5 +++-- view/theme/frio/css/style.css | 1 + view/theme/frio/php/Image.php | 8 ++++---- view/theme/frio/style.php | 7 +++++++ view/theme/frio/templates/theme_settings.tpl | 1 + 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index e9594b009b..26f725f25e 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -111,7 +111,7 @@ function frio_form($arr) } } - $background_image_help = '' . L10n::t('Note') . ': ' . L10n::t('Check image permissions if all users are allowed to visit the image'); + $background_image_help = '' . L10n::t('Note') . ': ' . L10n::t('Check image permissions if all users are allowed to see the image'); $t = get_markup_template('theme_settings.tpl'); $ctx = [ @@ -123,8 +123,9 @@ function frio_form($arr) '$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false], '$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false], '$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['background_color'], '', false], - '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), ((isset($arr['contentbg_transp']) && $arr['contentbg_transp'] != '') ? $arr['contentbg_transp'] : 100), ''], + '$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), defaults($arr, 'contentbg_transp', 100), ''], '$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false], + '$bg_image_options_title' => L10n::t('Background image style'), '$bg_image_options' => Image::get_options($arr), ]; diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 839aa9ac37..912c6a884c 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -27,6 +27,7 @@ body { background-color: $background_color; background-image: url("$background_image"); background-size: $background_size_img; + background-repeat: $background_repeat; background-attachment: fixed; color: #777; /*color: #555;*/ diff --git a/view/theme/frio/php/Image.php b/view/theme/frio/php/Image.php index 2b3cf3be8c..b1877393b9 100644 --- a/view/theme/frio/php/Image.php +++ b/view/theme/frio/php/Image.php @@ -21,10 +21,10 @@ class Image public static function get_options($arr) { $bg_image_options = [ - 'repeat' => ['frio_bg_image_option', L10n::t('Repeat the image'), 'repeat', L10n::t('Will repeat your image to fill the background.'), ($arr['bg_image_option'] == 'repeat')], - 'stretch' => ['frio_bg_image_option', L10n::t('Stretch'), 'stretch', L10n::t('Will stretch to width/height of the image.'), ($arr['bg_image_option'] == 'stretch')], - 'cover' => ['frio_bg_image_option', L10n::t('Resize fill and-clip'), 'cover', L10n::t('Resize to fill and retain aspect ratio.'), ($arr['bg_image_option'] == 'cover')], - 'contain' => ['frio_bg_image_option', L10n::t('Resize best fit'), 'contain', L10n::t('Resize to best fit and retain aspect ratio.'), ($arr['bg_image_option'] == 'contain')], + 'stretch' => ['frio_bg_image_option', L10n::t("Stretch"), "stretch", L10n::t("Resize image to the width of the screen and show background color below on long pages."), ($arr["bg_image_option"] == "stretch")], + 'cover' => ['frio_bg_image_option', L10n::t("Resize, fill and clip"), "cover", L10n::t("Resize image to fill entire screen, clipping either the right or the bottom."), ($arr["bg_image_option"] == "cover")], + 'repeat' => ['frio_bg_image_option', L10n::t("Repeat"), "repeat", L10n::t("Repeat image to fill the screen."), ($arr["bg_image_option"] == "repeat")], + 'contain' => ['frio_bg_image_option', L10n::t("Repeat one row"), "contain", L10n::t("Resize image to repeat it on a single row, either vertical or horizontal."), ($arr["bg_image_option"] == "contain")], ]; return $bg_image_options; diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php index 811db092a2..393dca2f90 100644 --- a/view/theme/frio/style.php +++ b/view/theme/frio/style.php @@ -152,22 +152,28 @@ if (!isset($link_hover_color)) { if (!isset($bg_image_option)) { $bg_image_option = null; } + switch ($bg_image_option) { case 'stretch': $background_size_img = '100%'; + $background_repeat = 'no-repeat'; break; case 'cover': $background_size_img = 'cover'; + $background_repeat = 'no-repeat'; break; case 'repeat': $background_size_img = 'auto'; + $background_repeat = 'repeat'; break; case 'contain': $background_size_img = 'contain'; + $background_repeat = 'repeat'; break; default: $background_size_img = 'auto'; + $background_repeat = 'no-repeat'; break; } @@ -187,6 +193,7 @@ $options = [ '$contentbg_transp' => $contentbg_transp, '$background_image' => $background_image, '$background_size_img' => $background_size_img, + '$background_repeat' => $background_repeat, '$login_bg_image' => $login_bg_image, '$login_bg_color' => $login_bg_color ]; diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index f524dd6e0e..50a8934d1b 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -25,6 +25,7 @@ {{if $background_image}}{{include file="field_fileinput.tpl" field=$background_image}}{{/if}} {{if $openid}} From 9bf58e46f622b051240d282acd3e52382d0fcb84 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Fri, 27 Apr 2018 20:22:17 +0000 Subject: [PATCH 21/23] Changes requested by @MrPetovan. --- src/Util/Network.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/Util/Network.php b/src/Util/Network.php index 91c4b7d395..f0338e0482 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -38,8 +38,25 @@ class Network { $ret = fetchUrlFull($url, $binary, $redirects, $timeout, $accept_content, $cookiejar); - return($ret['body']); + return $ret['body']; } + + /** + * @brief Curl wrapper with array of return values. + * + * Inner workings and parameters are the same as @ref fetchUrl but returns an array with + * all the information collected during the fetch. + * + * @param string $url URL to fetch + * @param boolean $binary default false + * TRUE if asked to return binary results (file download) + * @param integer $redirects The recursion counter for internal use - default 0 + * @param integer $timeout Timeout in seconds, default system config value or 60 seconds + * @param string $accept_content supply Accept: header with 'accept_content' as the value + * @param string $cookiejar Path to cookie jar file + * + * @return array With all relevant information, 'body' contains the actual fetched content. + */ public static function fetchUrlFull($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = 0) { return self::curl( From 5bb35756dc3988f7d35d50e426bebbe323a5a01d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 27 Apr 2018 20:56:34 -0400 Subject: [PATCH 22/23] Update directory URL protocol --- boot.php | 2 +- util/htconfig.vagrant.php | 2 +- view/templates/htconfig.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 1ca8b8d8d8..ba12f86d2c 100644 --- a/boot.php +++ b/boot.php @@ -1292,7 +1292,7 @@ function get_server() $server = Config::get("system", "directory"); if ($server == "") { - $server = "http://dir.friendica.social"; + $server = "https://dir.friendica.social"; } return($server); diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php index 9c96687e71..623b587ef0 100644 --- a/util/htconfig.vagrant.php +++ b/util/htconfig.vagrant.php @@ -65,7 +65,7 @@ $a->config['system']['no_regfullname'] = true; //$a->config['system']['block_local_dir'] = false; // Location of the global directory -$a->config['system']['directory'] = 'http://dir.friendica.social'; +$a->config['system']['directory'] = 'https://dir.friendica.social'; // turn on friendica's log $a->config['system']['debugging'] = true; diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index d72307fb5a..1325a61771 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -107,7 +107,7 @@ $a->config['system']['no_regfullname'] = true; //$a->config['system']['block_local_dir'] = false; // Location of the global directory -$a->config['system']['directory'] = 'http://dir.friendica.social'; +$a->config['system']['directory'] = 'https://dir.friendica.social'; // Authentication cookie lifetime, in days $a->config['system']['auth_cookie_lifetime'] = 7; From 91e0a9227e43b74b8a3b76f40fb6ebb2bba15526 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Sat, 28 Apr 2018 06:46:46 +0000 Subject: [PATCH 23/23] Fix #4943. PR #4939 introduced a bug that only surfaces when using Network from extern. Use proper self reference to fix that. --- src/Util/Network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/Network.php b/src/Util/Network.php index f0338e0482..c1ea6e3547 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -36,7 +36,7 @@ class Network */ public static function fetchUrl($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = 0) { - $ret = fetchUrlFull($url, $binary, $redirects, $timeout, $accept_content, $cookiejar); + $ret = self::fetchUrlFull($url, $binary, $redirects, $timeout, $accept_content, $cookiejar); return $ret['body']; }