diff --git a/home.html b/home.html new file mode 100644 index 000000000..83fe0f3cc --- /dev/null +++ b/home.html @@ -0,0 +1,11 @@ +mistpark network logo +

+Bring your privacy back home - where it belongs. +

+

+Share your life with your friends and family - privately, securely. +

+

+Join the mistpark "dispersed" social network. +

+
diff --git a/images/mistpark-net.jpg b/images/mistpark-net.jpg new file mode 100644 index 000000000..c3be16b81 Binary files /dev/null and b/images/mistpark-net.jpg differ diff --git a/include/auth.php b/include/auth.php index 78e2bb8e0..b856379f1 100644 --- a/include/auth.php +++ b/include/auth.php @@ -42,6 +42,8 @@ else { unset($_SESSION['visitor_id']); unset($_SESSION['administrator']); unset($_SESSION['cid']); + unset($_SESSION['theme']); + $encrypted = hash('whirlpool',trim($_POST['password'])); if((x($_POST,'auth-params')) && $_POST['auth-params'] == 'login') { diff --git a/include/nav.php b/include/nav.php index 4833ed7db..94fbf36bb 100644 --- a/include/nav.php +++ b/include/nav.php @@ -40,3 +40,4 @@ if(x($_SESSION['uid'])) { } $a->page['nav'] .= "\r\n\r\n"; + $a->page['nav'] .= ''; diff --git a/mod/contacts.php b/mod/contacts.php index 2469e0c6f..45f792d30 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -72,6 +72,7 @@ function contacts_post(&$a) { function contacts_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL); return; diff --git a/mod/directory.php b/mod/directory.php index 9cce16760..4e3657673 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -4,6 +4,7 @@ function directory_init(&$a) { } function directory_content(&$a) { + $o .= ''; $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); diff --git a/mod/home.php b/mod/home.php index 3a1aa212a..4406576a3 100644 --- a/mod/home.php +++ b/mod/home.php @@ -15,6 +15,8 @@ function home_content(&$a) { $a->page['footer'] .= "
Powered by mistpark
"; $o .= '

Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '

'; + if(file_exists('home.html')) + $o .= file_get_contents('home.html'); $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); return $o; diff --git a/mod/message.php b/mod/message.php index 2048cff1f..6119e894f 100644 --- a/mod/message.php +++ b/mod/message.php @@ -82,6 +82,7 @@ function message_post(&$a) { } function message_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL); diff --git a/mod/network.php b/mod/network.php index afe44dabf..c5845f63c 100644 --- a/mod/network.php +++ b/mod/network.php @@ -19,6 +19,8 @@ function network_content(&$a, $update = false) { $group = 0; if(! $update) { + $o .= ''; + // pull out the group here because the updater might have different args if($a->argc > 1) { $group = intval($a->argv[1]); diff --git a/mod/notifications.php b/mod/notifications.php index 6422b3b00..96f50d90b 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -57,6 +57,7 @@ function notifications_content(&$a) { } $o = ''; + $o .= ''; if(($a->argc > 1) && ($a->argv[1] == 'all')) $sql_extra = ''; diff --git a/mod/profile.php b/mod/profile.php index c42291d96..6923b0923 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -89,6 +89,7 @@ function profile_content(&$a, $update = false) { $a->profile['profile_uid'] = $_SESSION['profile_uid']; } else { + $o .= ''; // set the uid so we can pick it up during update $_SESSION['profile_uid'] = $a->profile['uid']; } diff --git a/mod/profiles.php b/mod/profiles.php index 5ee9a3e96..c9dc4c80c 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -157,6 +157,7 @@ function profiles_post(&$a) { function profiles_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL); return; diff --git a/mod/settings.php b/mod/settings.php index fbeee7768..2e14fcee5 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -155,6 +155,7 @@ function settings_post(&$a) { if(! function_exists('settings_content')) { function settings_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL ); @@ -229,9 +230,9 @@ function settings_content(&$a) { '$basepath' => $a->get_hostname(), '$baseurl' => $a->get_baseurl())); - $o = file_get_contents('view/settings.tpl'); + $stpl = file_get_contents('view/settings.tpl'); - $o = replace_macros($o,array( + $o .= replace_macros($stpl,array( '$baseurl' => $a->get_baseurl(), '$uid' => $_SESSION['uid'], '$username' => $username, diff --git a/view/default.php b/view/default.php index 47adf4a76..2d45d946a 100644 --- a/view/default.php +++ b/view/default.php @@ -6,7 +6,7 @@
- +
diff --git a/view/directory_header.tpl b/view/directory_header.tpl index c4217ac48..ba39236f2 100644 --- a/view/directory_header.tpl +++ b/view/directory_header.tpl @@ -1,6 +1,6 @@

Site Directory

- + $finding diff --git a/view/profile.php b/view/profile.php index e2c190da0..a07a45220 100644 --- a/view/profile.php +++ b/view/profile.php @@ -6,7 +6,7 @@
- +