X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pageheader%2Fpageheader.php;h=173fc707ef3f9e3d7ceb76b8447bfa23d597f72a;hb=29d58005dc8b8e99a686d009d22368d14da2cba9;hp=d9b187de3afadcf51d9651fdf882b34ce3af98e8;hpb=391f57fa395a3ea79e76c1df9e1d66766136ca0f;p=friendica-addons.git

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index d9b187de..173fc707 100755
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -4,13 +4,14 @@
 /**
  * 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>
  * 
  */
 
 function pageheader_install() {
-    register_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+    register_hook('page_content_top', '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');
 
@@ -18,10 +19,13 @@ function pageheader_install() {
 
 
 function pageheader_uninstall() {
-    unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+    unregister_hook('page_content_top', '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');
 
+	// hook moved, uninstall the old one if still there. 
+    unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch');
+
 }
 
 
@@ -41,15 +45,16 @@ function pageheader_addon_settings(&$a,&$s) {
 
 	$words = get_config('pageheader','text');
 	if(! $words)
-		$words = 'pageheader,';
+		$words = '';
 
     $s .= '<div class="settings-block">';
     $s .= '<h3>' . 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">' . 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="' . t('Save Settings') . '" /></div></div>';
 
 	return;
 
@@ -67,12 +72,18 @@ function pageheader_addon_settings_post(&$a,&$b) {
 }
 
 function pageheader_fetch($a,&$b) {
+	
+	if(file_exists('pageheader.html')){
+		$s = file_get_contents('pageheader.html');
+	} else {
+		$s = get_config('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>';
 }