convert spaces to tabs, removed netbeans project files

diff --git a/.gitignore b/.gitignore
index 36ccc906e56c08e141dbabf5df1e7b31b120524c..0d32de00b8705dd29d03872a8335281354173e73 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ report/
 #ignore OSX .DS_Store files\r
 .DS_Store\r
 \r
-/nbproject/private/\r
+/nbproject/\r
 \r
 #ignore smarty cache\r
 /view/smarty3/compiled/\r

diff --git a/cookienotice/cookienotice.css b/cookienotice/cookienotice.css
index 9c8cf53973502b59940102e9081b2940d043f37f..6bbc56bd5490b35a95df2a80117254ace97a800b 100644 (file)
--- 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 e8c573ee6e343a61af35cbfac33807cfe4916edd..dd5c1bbdaa5ebf0512420f9f31d82ab88a6c9f64 100644 (file)
--- 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'] .= '<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;
 }

diff --git a/cookienotice/templates/cookienotice.tpl b/cookienotice/templates/cookienotice.tpl
index 19ab471e200f102b1ea7f776a05ec074346352d4..bee362d5ba6d9f538ce0e6a20a959e7c4e2a0399 100644 (file)
--- a/cookienotice/templates/cookienotice.tpl
+++ b/cookienotice/templates/cookienotice.tpl
@@ -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>
 

diff --git a/cookienotice/templates/head.tpl b/cookienotice/templates/head.tpl
index 7640b28dd42ca9a68f213be3d67ff69a4bdacbe6..ed0fc87a205eae590490c5d7dae640c8aae056c7 100644 (file)
--- a/cookienotice/templates/head.tpl
+++ b/cookienotice/templates/head.tpl
@@ -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>

diff --git a/cookienotice/templates/settings.tpl b/cookienotice/templates/settings.tpl
index 6fa8f176df9058765eab25ec249916936a050cf4..79a5d9bd3978459db27b956b98a5a6a8a20e2b41 100644 (file)
--- a/cookienotice/templates/settings.tpl
+++ b/cookienotice/templates/settings.tpl
@@ -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>

diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644 (file)
index 911a7b8..0000000
--- 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 (file)
index d3fa6af..0000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -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>