X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=pageheader%2Fpageheader.php;h=7b6924167556f749d932d6ba5932e9d834688b48;hb=e4f32f8ac8dbee577dc31195b1104add371f77eb;hp=d9b187de3afadcf51d9651fdf882b34ce3af98e8;hpb=858758e92c5d8c1c41e188284fea53ae50fb0855;p=friendica-addons.git

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
old mode 100755
new mode 100644
index d9b187de..7b692416
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -1,26 +1,31 @@
 <?php
-
-
 /**
  * Name: Page Header
  * Description: Inserts a page header
- * Version: 1.0
+ * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
+ *         Hauke Altmann <https://snarl.de/profile/tugelblend>
  * 
  */
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
 
 function pageheader_install() {
-    register_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
-	register_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
-	register_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
+    Addon::registerHook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+	Addon::registerHook('addon_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
+	Addon::registerHook('addon_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
 
 }
 
 
 function pageheader_uninstall() {
-    unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
-	unregister_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
-	unregister_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
+    Addon::unregisterHook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+	Addon::unregisterHook('addon_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post');
+
+	// hook moved, uninstall the old one if still there. 
+    Addon::unregisterHook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
 
 }
 
@@ -39,17 +44,18 @@ function pageheader_addon_settings(&$a,&$s) {
     $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
 
 
-	$words = get_config('pageheader','text');
+	$words = Config::get('pageheader','text');
 	if(! $words)
-		$words = 'pageheader,';
+		$words = '';
 
     $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('"pageheader" Settings') . '</h3>';
+    $s .= '<h3>' . L10n::t('"pageheader" Settings') . '</h3>';
     $s .= '<div id="pageheader-wrapper">';
-    $s .= '<input id="pageheader-words" type="text" size="80" name="pageheader-words" value="' . $words .'" />';
+    $s .= '<label id="pageheader-label" for="pageheader-words">' . L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)') . ' </label>';
+    $s .= '<textarea id="pageheader-words" type="text" name="pageheader-words">' . $words . '</textarea>';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 	return;
 
@@ -61,18 +67,24 @@ function pageheader_addon_settings_post(&$a,&$b) {
 		return;
 
 	if($_POST['pageheader-submit']) {
-		set_config('pageheader','text',trim(strip_tags($_POST['pageheader-words'])));
-		info( t('pageheader Settings saved.') . EOL);
+		Config::set('pageheader','text',trim(strip_tags($_POST['pageheader-words'])));
+		info(L10n::t('pageheader Settings saved.') . EOL);
 	}
 }
 
 function pageheader_fetch($a,&$b) {
+	
+	if(file_exists('pageheader.html')){
+		$s = file_get_contents('pageheader.html');
+	} else {
+		$s = Config::get('pageheader', 'text');
+	}
 
     $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
         . $a->get_baseurl() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
-    $s = get_config('pageheader','text');
+    
     if(! $s)
         $s = '';
     if ($s != '')
-    	$b .= '<div class="pageheader">' . $s . '</div>';
+        $b .= '<div class="pageheader">' . $s . '</div>';
 }