Browse Source

convert spaces to tabs, removed netbeans project files

pull/794/head
Peter Liebetrau 2 years ago
parent
commit
f3a5f16fc1
8 changed files with 119 additions and 137 deletions
  1. +1
    -1
      .gitignore
  2. +12
    -12
      cookienotice/cookienotice.css
  3. +49
    -51
      cookienotice/cookienotice.php
  4. +19
    -19
      cookienotice/templates/cookienotice.tpl
  5. +36
    -36
      cookienotice/templates/head.tpl
  6. +2
    -2
      cookienotice/templates/settings.tpl
  7. +0
    -7
      nbproject/project.properties
  8. +0
    -9
      nbproject/project.xml

+ 1
- 1
.gitignore View File

@ -18,7 +18,7 @@ report/
#ignore OSX .DS_Store files
.DS_Store
/nbproject/private/
/nbproject/
#ignore smarty cache
/view/smarty3/compiled/

+ 12
- 12
cookienotice/cookienotice.css View File

@ -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;
}

+ 49
- 51
cookienotice/cookienotice.php View File

@ -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'] .= '<link rel="stylesheet" type="text/css" href="/addon/cookienotice/cookienotice.css" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="/addon/cookienotice/cookienotice.css" media="all" />' . "\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('<b>Configure your cookie usage notice.</b> 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('<b>Configure your cookie usage notice.</b> 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 ($_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 (!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);
}
}
/**
@ -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;
}

+ 19
- 19
cookienotice/templates/cookienotice.tpl View File

@ -1,23 +1,23 @@
<style type="text/css">
#cookienotice-box {
display: none;
position: fixed;
z-index: 10000;
bottom: 0px;
left: 0;
width: 100%;
background-color: #101010;
color: #f0f0f0;
padding: 2em 1em;
text-align: center;
}
#cookienotice-ok-button {
border: 1px solid darkgoldenrod;
background-color: gold;
color: #101010;
min-width: 80px;
padding: .5em .1em;
}
#cookienotice-box {
display: none;
position: fixed;
z-index: 10000;
bottom: 0px;
left: 0;
width: 100%;
background-color: #101010;
color: #f0f0f0;
padding: 2em 1em;
text-align: center;
}
#cookienotice-ok-button {
border: 1px solid darkgoldenrod;
background-color: gold;
color: #101010;
min-width: 80px;
padding: .5em .1em;
}
</style>
<div id="cookienotice-box"><p>{{$text}}</p><button id="cookienotice-ok-button">{{$oktext}}</button></div>

+ 36
- 36
cookienotice/templates/head.tpl View File

@ -1,40 +1,40 @@
<!-- <link rel="stylesheet" type="text/css" href="/addon/cookienotice/css/cookienotice.css" /> -->
<script>
window.addEventListener("load", function () {
var cookiename = 'cncookiesaccepted'
var cookie = getCookie(cookiename);
if (cookie == "") {
document.getElementById('cookienotice-box').style.display = 'block';
document.getElementById('cookienotice-ok-button').onclick = function () {
console.log('clicked');
setCookie(cookiename, 1, 365);
document.getElementById('cookienotice-box').style.display = 'none';
};
}
function setCookie(cname, cvalue, exdays) {
var d = new Date();
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
var expires = "expires=" + d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}
function getCookie(cname) {
var name = cname + "=";
var decodedCookie = decodeURIComponent(document.cookie);
var ca = decodedCookie.split(';');
for (var i = 0; i < ca.length; i++) {
var c = ca[i];
while (c.charAt(0) == ' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
}
window.addEventListener("load", function () {
var cookiename = 'cncookiesaccepted'
var cookie = getCookie(cookiename);
if (cookie == "") {
document.getElementById('cookienotice-box').style.display = 'block';
document.getElementById('cookienotice-ok-button').onclick = function () {
console.log('clicked');
setCookie(cookiename, 1, 365);
document.getElementById('cookienotice-box').style.display = 'none';
};
}
function setCookie(cname, cvalue, exdays) {
var d = new Date();
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
var expires = "expires=" + d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}
function getCookie(cname) {
var name = cname + "=";
var decodedCookie = decodeURIComponent(document.cookie);
var ca = decodedCookie.split(';');
for (var i = 0; i < ca.length; i++) {
var c = ca[i];
while (c.charAt(0) == ' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
}
});
});
</script>

+ 2
- 2
cookienotice/templates/settings.tpl View File

@ -5,9 +5,9 @@
<span class="fakelink" onclick="openClose('settings_cookienotice_expanded'); openClose('settings_cookienotice_inflated');">
<h3>{{$title}}</h3>
</span>
<p>{{$description}}</p>
<p>{{$description}}</p>
{{include file="field_textarea.tpl" field=$text}}
{{include file="field_input.tpl" field=$oktext}}
{{include file="field_input.tpl" field=$oktext}}
<div class="settings-submit-wrapper" >
<input type="submit" id="cookienotice-submit" name="cookienotice-submit" class="settings-submit" value="{{$submit}}" />
</div>


+ 0
- 7
nbproject/project.properties View File

@ -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=.

+ 0
- 9
nbproject/project.xml View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.php.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/php-project/1">
<name>friendica addons</name>
</data>
</configuration>
</project>

Loading…
Cancel
Save