Changed some stuff to use sitename rather than Mahara

htdocs/contact.php

@@ -90,12 +90,7 @@ function contactus_submit($values) {
     }
 
     $to = new StdClass;
-    if (!$sitename = @get_config('sitename')) {
-        $to->firstname = 'mahara';
-    }
-    else {
-        $to->firstname = $sitename;
-    }
+    $to->firstname = get_config('sitename');
     $to->lastname = 'contact email';
     $to->email = $contactemail;
 

htdocs/lib/web.php

@@ -109,6 +109,9 @@ function &smarty($javascript = array(), $headers = array(), $strings = array())
 
     $smarty->assign('THEMEURL', get_config('themeurl'));
     $smarty->assign('WWWROOT', get_config('wwwroot'));
+    $sitename = get_config('sitename');
+    $smarty->assign('title', $sitename);
+    $smarty->assign('heading', $sitename);
 
     if (defined('PUBLIC')) {
         $smarty->assign('PUBLIC', true);