convert spaces to tabs, removed netbeans project files
This commit is contained in:
parent
fa08109830
commit
f3a5f16fc1
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -18,7 +18,7 @@ report/
|
||||||
#ignore OSX .DS_Store files
|
#ignore OSX .DS_Store files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
/nbproject/private/
|
/nbproject/
|
||||||
|
|
||||||
#ignore smarty cache
|
#ignore smarty cache
|
||||||
/view/smarty3/compiled/
|
/view/smarty3/compiled/
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
#cookienotice-label {
|
#cookienotice-label {
|
||||||
float: left;
|
float: left;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#cookienotice-text {
|
#cookienotice-text {
|
||||||
float: left;
|
float: left;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
height: 150px;
|
height: 150px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#cookienotice-submit {
|
#cookienotice-submit {
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cookienotice {
|
.cookienotice {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,64 +13,63 @@ use Friendica\Core\L10n;
|
||||||
|
|
||||||
function cookienotice_install()
|
function cookienotice_install()
|
||||||
{
|
{
|
||||||
$file = 'addon/cookienotice/cookienotice.php';
|
$file = 'addon/cookienotice/cookienotice.php';
|
||||||
Addon::registerHook('page_content_top', $file, 'cookienotice_page_content_top');
|
Addon::registerHook('page_content_top', $file, 'cookienotice_page_content_top');
|
||||||
Addon::registerHook('page_end', $file, 'cookienotice_page_end');
|
Addon::registerHook('page_end', $file, 'cookienotice_page_end');
|
||||||
Addon::registerHook('addon_settings', $file, 'cookienotice_addon_settings');
|
Addon::registerHook('addon_settings', $file, 'cookienotice_addon_settings');
|
||||||
Addon::registerHook('addon_settings_post', $file, 'cookienotice_addon_settings_post');
|
Addon::registerHook('addon_settings_post', $file, 'cookienotice_addon_settings_post');
|
||||||
}
|
}
|
||||||
|
|
||||||
function cookienotice_uninstall()
|
function cookienotice_uninstall()
|
||||||
{
|
{
|
||||||
$file = 'addon/cookienotice/cookienotice.php';
|
$file = 'addon/cookienotice/cookienotice.php';
|
||||||
Addon::unregisterHook('page_content_top', $file, 'cookienotice_page_content_top');
|
Addon::unregisterHook('page_content_top', $file, 'cookienotice_page_content_top');
|
||||||
Addon::unregisterHook('page_end', $file, 'cookienotice_page_end');
|
Addon::unregisterHook('page_end', $file, 'cookienotice_page_end');
|
||||||
Addon::unregisterHook('addon_settings', $file, 'cookienotice_addon_settings');
|
Addon::unregisterHook('addon_settings', $file, 'cookienotice_addon_settings');
|
||||||
Addon::unregisterHook('addon_settings_post', $file, 'cookienotice_addon_settings_post');
|
Addon::unregisterHook('addon_settings_post', $file, 'cookienotice_addon_settings_post');
|
||||||
}
|
}
|
||||||
|
|
||||||
function cookienotice_addon_settings(&$a, &$s)
|
function cookienotice_addon_settings(&$a, &$s)
|
||||||
{
|
{
|
||||||
if (!is_site_admin())
|
if (!is_site_admin())
|
||||||
return;
|
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');
|
$text = Config::get('cookienotice', 'text');
|
||||||
if (!$text) {
|
if (!$text) {
|
||||||
$text = '';
|
$text = '';
|
||||||
}
|
}
|
||||||
$oktext = Config::get('cookienotice', 'oktext');
|
$oktext = Config::get('cookienotice', 'oktext');
|
||||||
if (!$oktext) {
|
if (!$oktext) {
|
||||||
$oktext = '';
|
$oktext = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$t = get_markup_template("settings.tpl", "addon/cookienotice/");
|
$t = get_markup_template("settings.tpl", "addon/cookienotice/");
|
||||||
$s .= replace_macros($t, [
|
$s .= replace_macros($t, [
|
||||||
'$title' => L10n::t('"cookienotice" Settings'),
|
'$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.'),
|
'$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')],
|
'$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')],
|
'$oktext' => ['cookienotice-oktext', L10n::t('OK Button Text'), $oktext, L10n::t('The OK Button text')],
|
||||||
'$submit' => L10n::t('Save Settings')
|
'$submit' => L10n::t('Save Settings')
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function cookienotice_addon_settings_post(&$a, &$b)
|
function cookienotice_addon_settings_post(&$a, &$b)
|
||||||
{
|
{
|
||||||
|
if (!is_site_admin())
|
||||||
|
return;
|
||||||
|
|
||||||
if (!is_site_admin())
|
if ($_POST['cookienotice-submit']) {
|
||||||
return;
|
Config::set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text'])));
|
||||||
|
Config::set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext'])));
|
||||||
if ($_POST['cookienotice-submit']) {
|
info(L10n::t('cookienotice Settings saved.') . EOL);
|
||||||
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)
|
function cookienotice_page_content_top($a, &$b)
|
||||||
{
|
{
|
||||||
$head = file_get_contents(__DIR__ . '/templates/head.tpl');
|
$head = file_get_contents(__DIR__ . '/templates/head.tpl');
|
||||||
$a->page['htmlhead'] .= $head;
|
$a->page['htmlhead'] .= $head;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -94,16 +93,15 @@ function cookienotice_page_content_top($a, &$b)
|
||||||
*/
|
*/
|
||||||
function cookienotice_page_end($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');
|
$page_end_tpl = get_markup_template("cookienotice.tpl", "addon/cookienotice/");
|
||||||
$oktext = (string) Config::get('cookienotice', 'oktext');
|
|
||||||
|
|
||||||
$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, [
|
$b .= $page_end;
|
||||||
'$text' => $text,
|
|
||||||
'$oktext' => $oktext,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$b .= $page_end;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
#cookienotice-box {
|
#cookienotice-box {
|
||||||
display: none;
|
display: none;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 10000;
|
z-index: 10000;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-color: #101010;
|
background-color: #101010;
|
||||||
color: #f0f0f0;
|
color: #f0f0f0;
|
||||||
padding: 2em 1em;
|
padding: 2em 1em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
#cookienotice-ok-button {
|
#cookienotice-ok-button {
|
||||||
border: 1px solid darkgoldenrod;
|
border: 1px solid darkgoldenrod;
|
||||||
background-color: gold;
|
background-color: gold;
|
||||||
color: #101010;
|
color: #101010;
|
||||||
min-width: 80px;
|
min-width: 80px;
|
||||||
padding: .5em .1em;
|
padding: .5em .1em;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<div id="cookienotice-box"><p>{{$text}}</p><button id="cookienotice-ok-button">{{$oktext}}</button></div>
|
<div id="cookienotice-box"><p>{{$text}}</p><button id="cookienotice-ok-button">{{$oktext}}</button></div>
|
||||||
|
|
||||||
|
|
|
@ -1,40 +1,40 @@
|
||||||
<!-- <link rel="stylesheet" type="text/css" href="/addon/cookienotice/css/cookienotice.css" /> -->
|
<!-- <link rel="stylesheet" type="text/css" href="/addon/cookienotice/css/cookienotice.css" /> -->
|
||||||
<script>
|
<script>
|
||||||
window.addEventListener("load", function () {
|
window.addEventListener("load", function () {
|
||||||
var cookiename = 'cncookiesaccepted'
|
var cookiename = 'cncookiesaccepted'
|
||||||
var cookie = getCookie(cookiename);
|
var cookie = getCookie(cookiename);
|
||||||
|
|
||||||
if (cookie == "") {
|
if (cookie == "") {
|
||||||
document.getElementById('cookienotice-box').style.display = 'block';
|
document.getElementById('cookienotice-box').style.display = 'block';
|
||||||
document.getElementById('cookienotice-ok-button').onclick = function () {
|
document.getElementById('cookienotice-ok-button').onclick = function () {
|
||||||
console.log('clicked');
|
console.log('clicked');
|
||||||
setCookie(cookiename, 1, 365);
|
setCookie(cookiename, 1, 365);
|
||||||
document.getElementById('cookienotice-box').style.display = 'none';
|
document.getElementById('cookienotice-box').style.display = 'none';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function setCookie(cname, cvalue, exdays) {
|
function setCookie(cname, cvalue, exdays) {
|
||||||
var d = new Date();
|
var d = new Date();
|
||||||
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
|
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
|
||||||
var expires = "expires=" + d.toUTCString();
|
var expires = "expires=" + d.toUTCString();
|
||||||
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
|
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCookie(cname) {
|
function getCookie(cname) {
|
||||||
var name = cname + "=";
|
var name = cname + "=";
|
||||||
var decodedCookie = decodeURIComponent(document.cookie);
|
var decodedCookie = decodeURIComponent(document.cookie);
|
||||||
var ca = decodedCookie.split(';');
|
var ca = decodedCookie.split(';');
|
||||||
for (var i = 0; i < ca.length; i++) {
|
for (var i = 0; i < ca.length; i++) {
|
||||||
var c = ca[i];
|
var c = ca[i];
|
||||||
while (c.charAt(0) == ' ') {
|
while (c.charAt(0) == ' ') {
|
||||||
c = c.substring(1);
|
c = c.substring(1);
|
||||||
}
|
}
|
||||||
if (c.indexOf(name) == 0) {
|
if (c.indexOf(name) == 0) {
|
||||||
return c.substring(name.length, c.length);
|
return c.substring(name.length, c.length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
<span class="fakelink" onclick="openClose('settings_cookienotice_expanded'); openClose('settings_cookienotice_inflated');">
|
<span class="fakelink" onclick="openClose('settings_cookienotice_expanded'); openClose('settings_cookienotice_inflated');">
|
||||||
<h3>{{$title}}</h3>
|
<h3>{{$title}}</h3>
|
||||||
</span>
|
</span>
|
||||||
<p>{{$description}}</p>
|
<p>{{$description}}</p>
|
||||||
{{include file="field_textarea.tpl" field=$text}}
|
{{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" >
|
<div class="settings-submit-wrapper" >
|
||||||
<input type="submit" id="cookienotice-submit" name="cookienotice-submit" class="settings-submit" value="{{$submit}}" />
|
<input type="submit" id="cookienotice-submit" name="cookienotice-submit" class="settings-submit" value="{{$submit}}" />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -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=.
|
|
|
@ -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…
Reference in a new issue