diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/contacts.php | 9 | ||||
| -rw-r--r-- | mod/dfrn_request.php | 29 | ||||
| -rw-r--r-- | mod/directory.php | 2 | ||||
| -rw-r--r-- | mod/home.php | 9 | ||||
| -rw-r--r-- | mod/login.php | 3 | ||||
| -rw-r--r-- | mod/profile.php | 2 | ||||
| -rw-r--r-- | mod/register.php | 4 | ||||
| -rw-r--r-- | mod/search.php | 3 |
8 files changed, 54 insertions, 7 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 92bce0a73..7236a200d 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -40,6 +40,8 @@ function contacts_post(&$a) { return; // NOTREACHED } + call_hooks('contact_edit_post', $_POST); + $profile_id = intval($_POST['profile-assign']); if($profile_id) { $r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -260,7 +262,11 @@ function contacts_content(&$a) { )); - return $o; + $arr = array('contact' => $r[0],'output' => $o); + + call_hooks('contact_edit', $arr); + + return $arr['output']; } @@ -350,6 +356,7 @@ function contacts_content(&$a) { '$url' => $url )); } + $o .= '<div id="contact-edit-end"></div>'; } diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 844fbbf6d..6850f4be4 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -245,6 +245,29 @@ function dfrn_request_post(&$a) { } } + /** + * + * Cleanup old introductions that remain blocked. + * Also remove the contact record, but only if there is no existing relationship + * + */ + + $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` + FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id` + WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE "); + if(count($r)) { + foreach($r as $rr) { + if(! $rr['rel']) { + q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1", + intval($rr['cid']) + ); + } + q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", + intval($rr['iid']) + ); + } + } + $url = trim($_POST['dfrn_url']); if(! strlen($url)) { notice( t("Invalid locator") . EOL ); @@ -452,6 +475,12 @@ function dfrn_request_content(&$a) { if(! local_user()) { notice( t("Please login to confirm introduction.") . EOL ); + + /* setup the return URL to come back to this page if they use openid */ + + $stripped = str_replace('q=','',$a->query_string); + $_SESSION['return_url'] = trim($stripped,'/'); + return login(); } diff --git a/mod/directory.php b/mod/directory.php index b0cee76cb..82f2b79b3 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -14,6 +14,8 @@ function directory_post(&$a) { function directory_content(&$a) { $o = ''; $o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>'; + if(x($_SESSION,'theme')) + unset($_SESSION['theme']); if(x($a->data,'search')) $search = notags(trim($a->data['search'])); diff --git a/mod/home.php b/mod/home.php index 2d646f8dd..d45b13ed5 100644 --- a/mod/home.php +++ b/mod/home.php @@ -14,11 +14,10 @@ if(! function_exists('home_content')) { function home_content(&$a) { $o = ''; -/* - * if(! (x($a->page,'footer'))) - * $a->page['footer'] = ''; - * $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>"; - */ + + if(x($_SESSION,'theme')) + unset($_SESSION['theme']); + $o .= '<h1>' . ((x($a->config,'sitename')) ? t("Welcome to ").$a->config['sitename'] : "" ) . '</h1>'; if(file_exists('home.html')) $o .= file_get_contents('home.html'); diff --git a/mod/login.php b/mod/login.php index 6ee625966..58af42d74 100644 --- a/mod/login.php +++ b/mod/login.php @@ -1,5 +1,8 @@ <?php function login_content(&$a) { + if(x($_SESSION,'theme')) + unset($_SESSION['theme']); return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); + }
\ No newline at end of file diff --git a/mod/profile.php b/mod/profile.php index 5479f2806..e8eee810b 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -245,7 +245,7 @@ function profile_content(&$a, $update = 0) { $alike = array(); $dlike = array(); - if(count($r)) { + if($r !== false && count($r)) { foreach($r as $item) { like_puller($a,$item,$alike,'like'); diff --git a/mod/register.php b/mod/register.php index fcc9ebcab..86bfe2066 100644 --- a/mod/register.php +++ b/mod/register.php @@ -360,6 +360,10 @@ function register_content(&$a) { return; } + if(x($_SESSION,'theme')) + unset($_SESSION['theme']); + + $username = ((x($_POST,'username')) ? $_POST['username'] : ((x($_GET,'username')) ? $_GET['username'] : '')); $email = ((x($_POST,'email')) ? $_POST['email'] : ((x($_GET,'email')) ? $_GET['email'] : '')); $openid_url = ((x($_POST,'openid_url')) ? $_POST['openid_url'] : ((x($_GET,'openid_url')) ? $_GET['openid_url'] : '')); diff --git a/mod/search.php b/mod/search.php index 7605e9ae2..20113e75b 100644 --- a/mod/search.php +++ b/mod/search.php @@ -9,6 +9,9 @@ function search_post(&$a) { function search_content(&$a) { + if(x($_SESSION,'theme')) + unset($_SESSION['theme']); + $o = '<div id="live-search"></div>' . "\r\n"; $o .= '<h3>' . t('Search') . '</h3>'; |