Some more code-cleanups:

[mailer.git] / inc / modules / guest / what-wernis_portal.php

diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index e6c3d6296ef592ac41b69792f3cd6fe677c7979f..813425e464cb487b5196ba1d265b436d01e01ca4 100644 (file)
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -47,7 +47,7 @@ loadIncludeOnce('inc/classes/rdf.class.php');
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('wernis')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('wernis'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('wernis'));
        return;
 } // END - if
 
@@ -56,13 +56,13 @@ $rdf = new fase4_rdf();
 $rdf->_use_nl2br = false;
 $rdf->use_dynamic_display(false);
 $rdf->set_CacheDir(getCachePath() . '');
-$rdf->set_salt(md5(getConfig('SITE_KEY')));
+$rdf->set_salt(md5(getSiteKey()));
 $rdf->set_max_item(10);
 $rdf->set_Options(
        array(
                'textinput' => 'hidden',
                'sitelink'  => 'http://www.wds66.com',
-               'refid'     => getConfig('wernis_refid'),
+               'refid'     => getWernisRefid(),
                'reflink'   => '/ref.php?refid=',
        )
 );
@@ -70,12 +70,12 @@ $rdf->set_Options(
 // Use proxy?
 if (isProxyUsed()) {
        // Set proxy data
-       $rdf->set_proxy(getConfig('proxy_host'), getConfig('proxy_port'));
+       $rdf->set_proxy(getProxyHost(), getProxyPort());
 
        // Use auth?
-       if (getConfig('proxy_username') != '') {
+       if (getProxyUsername() != '') {
                // Set auth data
-               $rdf->set_proxy_auth(getConfig('proxy_username'), getConfig('proxy_password'));
+               $rdf->set_proxy_auth(getProxyUsername(), getProxyPassword());
        } // END  - if
 } // END - if