From f3a5f16fc17e6400cae27276ac31ebe2d531bd84 Mon Sep 17 00:00:00 2001 From: Peter Liebetrau Date: Sun, 20 Jan 2019 14:20:20 +0100 Subject: [PATCH] convert spaces to tabs, removed netbeans project files --- .gitignore | 2 +- cookienotice/cookienotice.css | 24 +++--- cookienotice/cookienotice.php | 98 ++++++++++++------------- cookienotice/templates/cookienotice.tpl | 38 +++++----- cookienotice/templates/head.tpl | 72 +++++++++--------- cookienotice/templates/settings.tpl | 4 +- nbproject/project.properties | 7 -- nbproject/project.xml | 9 --- 8 files changed, 118 insertions(+), 136 deletions(-) delete mode 100644 nbproject/project.properties delete mode 100644 nbproject/project.xml diff --git a/.gitignore b/.gitignore index 36ccc906..0d32de00 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ report/ #ignore OSX .DS_Store files .DS_Store -/nbproject/private/ +/nbproject/ #ignore smarty cache /view/smarty3/compiled/ diff --git a/cookienotice/cookienotice.css b/cookienotice/cookienotice.css index 9c8cf539..6bbc56bd 100644 --- a/cookienotice/cookienotice.css +++ b/cookienotice/cookienotice.css @@ -1,23 +1,23 @@ #cookienotice-label { - float: left; - width: 300px; - margin-top: 10px; + float: left; + width: 300px; + margin-top: 10px; } #cookienotice-text { - float: left; - margin-top: 10px; - width: 400px; - height: 150px; + float: left; + margin-top: 10px; + width: 400px; + height: 150px; } #cookienotice-submit { - margin-top: 15px; + margin-top: 15px; } .cookienotice { - text-align: center; - width: 100%; - margin-top: 25px; - font-size: 20px; + text-align: center; + width: 100%; + margin-top: 25px; + font-size: 20px; } diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php index e8c573ee..dd5c1bbd 100644 --- a/cookienotice/cookienotice.php +++ b/cookienotice/cookienotice.php @@ -13,64 +13,63 @@ use Friendica\Core\L10n; function cookienotice_install() { - $file = 'addon/cookienotice/cookienotice.php'; - Addon::registerHook('page_content_top', $file, 'cookienotice_page_content_top'); - Addon::registerHook('page_end', $file, 'cookienotice_page_end'); - Addon::registerHook('addon_settings', $file, 'cookienotice_addon_settings'); - Addon::registerHook('addon_settings_post', $file, 'cookienotice_addon_settings_post'); + $file = 'addon/cookienotice/cookienotice.php'; + Addon::registerHook('page_content_top', $file, 'cookienotice_page_content_top'); + Addon::registerHook('page_end', $file, 'cookienotice_page_end'); + Addon::registerHook('addon_settings', $file, 'cookienotice_addon_settings'); + Addon::registerHook('addon_settings_post', $file, 'cookienotice_addon_settings_post'); } function cookienotice_uninstall() { - $file = 'addon/cookienotice/cookienotice.php'; - Addon::unregisterHook('page_content_top', $file, 'cookienotice_page_content_top'); - Addon::unregisterHook('page_end', $file, 'cookienotice_page_end'); - Addon::unregisterHook('addon_settings', $file, 'cookienotice_addon_settings'); - Addon::unregisterHook('addon_settings_post', $file, 'cookienotice_addon_settings_post'); + $file = 'addon/cookienotice/cookienotice.php'; + Addon::unregisterHook('page_content_top', $file, 'cookienotice_page_content_top'); + Addon::unregisterHook('page_end', $file, 'cookienotice_page_end'); + Addon::unregisterHook('addon_settings', $file, 'cookienotice_addon_settings'); + Addon::unregisterHook('addon_settings_post', $file, 'cookienotice_addon_settings_post'); } function cookienotice_addon_settings(&$a, &$s) { - if (!is_site_admin()) - return; + if (!is_site_admin()) + return; - /* Add our stylesheet to the page so we can make our settings look nice */ + /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - $text = Config::get('cookienotice', 'text'); - if (!$text) { - $text = ''; - } - $oktext = Config::get('cookienotice', 'oktext'); - if (!$oktext) { - $oktext = ''; - } + $text = Config::get('cookienotice', 'text'); + if (!$text) { + $text = ''; + } + $oktext = Config::get('cookienotice', 'oktext'); + if (!$oktext) { + $oktext = ''; + } - $t = get_markup_template("settings.tpl", "addon/cookienotice/"); - $s .= replace_macros($t, [ - '$title' => L10n::t('"cookienotice" Settings'), - '$description' => L10n::t('Configure your cookie usage notice. It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'), - '$text' => ['cookienotice-text', L10n::t('Cookie Usage Notice'), $text, L10n::t('The cookie usage notice')], - '$oktext' => ['cookienotice-oktext', L10n::t('OK Button Text'), $oktext, L10n::t('The OK Button text')], - '$submit' => L10n::t('Save Settings') - ]); + $t = get_markup_template("settings.tpl", "addon/cookienotice/"); + $s .= replace_macros($t, [ + '$title' => L10n::t('"cookienotice" Settings'), + '$description' => L10n::t('Configure your cookie usage notice. It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'), + '$text' => ['cookienotice-text', L10n::t('Cookie Usage Notice'), $text, L10n::t('The cookie usage notice')], + '$oktext' => ['cookienotice-oktext', L10n::t('OK Button Text'), $oktext, L10n::t('The OK Button text')], + '$submit' => L10n::t('Save Settings') + ]); - return; + return; } function cookienotice_addon_settings_post(&$a, &$b) { + if (!is_site_admin()) + return; - if (!is_site_admin()) - return; - - if ($_POST['cookienotice-submit']) { - Config::set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text']))); - Config::set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext']))); - info(L10n::t('cookienotice Settings saved.') . EOL); - } + if ($_POST['cookienotice-submit']) { + Config::set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text']))); + Config::set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext']))); + info(L10n::t('cookienotice Settings saved.') . EOL); + } } /** @@ -81,8 +80,8 @@ function cookienotice_addon_settings_post(&$a, &$b) */ function cookienotice_page_content_top($a, &$b) { - $head = file_get_contents(__DIR__ . '/templates/head.tpl'); - $a->page['htmlhead'] .= $head; + $head = file_get_contents(__DIR__ . '/templates/head.tpl'); + $a->page['htmlhead'] .= $head; } /** @@ -94,16 +93,15 @@ function cookienotice_page_content_top($a, &$b) */ function cookienotice_page_end($a, &$b) { + $text = (string) Config::get('cookienotice', 'text'); + $oktext = (string) Config::get('cookienotice', 'oktext'); - $text = (string) Config::get('cookienotice', 'text'); - $oktext = (string) Config::get('cookienotice', 'oktext'); + $page_end_tpl = get_markup_template("cookienotice.tpl", "addon/cookienotice/"); - $page_end_tpl = get_markup_template("cookienotice.tpl", "addon/cookienotice/"); + $page_end = replace_macros($page_end_tpl, [ + '$text' => $text, + '$oktext' => $oktext, + ]); - $page_end = replace_macros($page_end_tpl, [ - '$text' => $text, - '$oktext' => $oktext, - ]); - - $b .= $page_end; + $b .= $page_end; } diff --git a/cookienotice/templates/cookienotice.tpl b/cookienotice/templates/cookienotice.tpl index 19ab471e..bee362d5 100644 --- a/cookienotice/templates/cookienotice.tpl +++ b/cookienotice/templates/cookienotice.tpl @@ -1,23 +1,23 @@

{{$text}}

diff --git a/cookienotice/templates/head.tpl b/cookienotice/templates/head.tpl index 7640b28d..ed0fc87a 100644 --- a/cookienotice/templates/head.tpl +++ b/cookienotice/templates/head.tpl @@ -1,40 +1,40 @@ diff --git a/cookienotice/templates/settings.tpl b/cookienotice/templates/settings.tpl index 6fa8f176..79a5d9bd 100644 --- a/cookienotice/templates/settings.tpl +++ b/cookienotice/templates/settings.tpl @@ -5,9 +5,9 @@

{{$title}}

 -

{{$description}}

+

{{$description}}

{{include file="field_textarea.tpl" field=$text}} - {{include file="field_input.tpl" field=$oktext}} + {{include file="field_input.tpl" field=$oktext}}
diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 911a7b8b..00000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,7 +0,0 @@ -include.path=${php.global.include.path} -php.version=PHP_70 -source.encoding=UTF-8 -src.dir=. -tags.asp=false -tags.short=false -web.root=. diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index d3fa6afd..00000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - org.netbeans.modules.php.project - - - friendica addons - - -