X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=startpage%2Fstartpage.php;h=840b547e5ecc76f0c560e75118d5f5ce4f05ff69;hb=7e516b541dd92691ad490e1fb6efae123599cd85;hp=c4324576609d90f07978c24366457a4645db13dc;hpb=48dcbc6f3fc3edae74e3ea2c823011bfb7c26081;p=friendica-addons.git

diff --git a/startpage/startpage.php b/startpage/startpage.php
index c4324576..840b547e 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -4,22 +4,23 @@
  * Description: Set a preferred page to load on login from home page
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  */
-
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 function startpage_install() {
-	register_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
-	register_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
-	register_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+	Addon::registerHook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+	Addon::registerHook('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+	Addon::registerHook('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
 }
 
 
 function startpage_uninstall() {
-	unregister_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
-	unregister_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
-	unregister_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+	Addon::unregisterHook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+	Addon::unregisterHook('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
 }
 
 
@@ -30,10 +31,7 @@ function startpage_home_init($a, $b) {
 
 	$page = PConfig::get(local_user(),'startpage','startpage');
 	if(strlen($page)) {
-		$slash = ((strpos($page,'/') === 0) ? true : false);
-		if(stristr($page,'://'))
-			goaway($page);
-		goaway($a->get_baseurl() . (($slash) ? '' : '/') . $page);
+		goaway($page);
 	}
 	return;
 }
@@ -54,16 +52,12 @@ function startpage_settings_post($a,$post) {
 		PConfig::set(local_user(),'startpage','startpage',strip_tags(trim($_POST['startpage'])));
 }
 
-
 /**
  *
- * Called from the Plugin Setting form. 
+ * Called from the Addon Setting form.
  * Add our own settings info to the page.
  *
  */
-
-
-
 function startpage_settings(&$a,&$s) {
 
 	if(! local_user())
@@ -81,20 +75,20 @@ function startpage_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_startpage_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
-	$s .= '<h3>' . t('Startpage') . '</h3>';
+	$s .= '<h3>' . L10n::t('Startpage') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_startpage_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
-	$s .= '<h3>' . t('Startpage') . '</h3>';
+	$s .= '<h3>' . L10n::t('Startpage') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="startpage-page-wrapper">';
-	$s .= '<label id="startpage-page-label" for="startpage-page">' . t('Home page to load after login  - leave blank for profile wall') . '</label>';
+	$s .= '<label id="startpage-page-label" for="startpage-page">' . L10n::t('Home page to load after login  - leave blank for profile wall') . '</label>';
 	$s .= '<input id="startpage-page" type="text" name="startpage" value="' . $page . '" />';
 	$s .= '</div><div class="clear"></div>';
-	$s .= '<div id="startpage-desc">' . t('Examples: &quot;network&quot; or &quot;notifications/system&quot;') . '</div>';
+	$s .= '<div id="startpage-desc">' . L10n::t('Examples: &quot;network&quot; or &quot;notifications/system&quot;') . '</div>';
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="startpage-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="startpage-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 }