diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/contacts.php | 12 | ||||
| -rw-r--r-- | mod/dfrn_request.php | 7 | ||||
| -rw-r--r-- | mod/home.php | 2 | ||||
| -rw-r--r-- | mod/item.php | 4 | ||||
| -rw-r--r-- | mod/login.php | 3 |
5 files changed, 12 insertions, 16 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 999617aa1..585ac1423 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -184,7 +184,7 @@ function contacts_content(&$a) { return $o; } - +dbg(2); if(($a->argc == 2) && ($a->argv[1] == 'all')) $sql_extra = ''; else @@ -198,21 +198,21 @@ function contacts_content(&$a) { switch($sort_type) { case DIRECTION_BOTH : - $sql_extra = " AND `dfrn-id` != '' AND `issued-id` != '' "; + $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' "; break; case DIRECTION_IN : - $sql_extra = " AND `dfrn-id` = '' AND `issued-id` != '' "; + $sql_extra2 = " AND `dfrn-id` = '' AND `issued-id` != '' "; break; case DIRECTION_OUT : - $sql_extra = " AND `dfrn-id` != '' AND `issued-id` = '' "; + $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` = '' "; break; case DIRECTION_ANY : default: - $sql_extra = ''; + $sql_extra2 = ''; break; } - $r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra $sql_extra2 ", intval($_SESSION['uid'])); if(count($r)) { diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 7fb55c4bf..b0c7b36aa 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -39,7 +39,6 @@ function dfrn_request_post(&$a) { // to confirm the request. We've done so and clicked submit, // which brings us here. - $dfrn_url = notags(trim($_POST['dfrn_url'])); $aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0); $confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : ""); @@ -48,7 +47,7 @@ function dfrn_request_post(&$a) { if(x($dfrn_url)) { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `dfrn-url` = '%s' LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1", intval($_SESSION['uid']), dbesc($dfrn_url) ); @@ -88,7 +87,7 @@ function dfrn_request_post(&$a) { if($invalid) { notice( $invalid . ' required DFRN parameter' . (($invalid == 1) ? " was " : "s were " ) - . "not found at the given URL" . EOL ); + . "not found at the given URL" . EOL . print_r($parms,true)) ; return; } } @@ -220,7 +219,7 @@ function dfrn_request_post(&$a) { if($invalid) { notice( $invalid . ' required DFRN parameter' . (($invalid == 1) ? " was " : "s were " ) - . "not found at the given URL" . EOL) ; + . "not found at the given URL" . EOL . print_r($parms,true)) ; return; } diff --git a/mod/home.php b/mod/home.php index d796052ad..07087bb2c 100644 --- a/mod/home.php +++ b/mod/home.php @@ -19,7 +19,7 @@ function home_content(&$a) { $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://dfrn.org\" name=\"DFRN.org\" >DFRN</a></div>"; $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>'; - $o .= login(($a->config['register_html'] == REGISTER_CLOSED) ? 0 : 1); + $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); return $o; diff --git a/mod/item.php b/mod/item.php index e0497af7a..4de9dc59f 100644 --- a/mod/item.php +++ b/mod/item.php @@ -5,7 +5,7 @@ function sanitise_acl(&$item) { } function item_post(&$a) { - +dbg(3); if((! local_user()) && (! remote_user())) return; @@ -170,6 +170,6 @@ function item_post(&$a) { array(),$foo)); } - goaway($a->get_baseurl() . "/" . $_POST['return'] ); +// goaway($a->get_baseurl() . "/" . $_POST['return'] ); return; // NOTREACHED }
\ No newline at end of file diff --git a/mod/login.php b/mod/login.php index ba232a943..6ee625966 100644 --- a/mod/login.php +++ b/mod/login.php @@ -1,8 +1,5 @@ <?php - - function login_content(&$a) { -// return login($a->config['register_enabled']); return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); }
\ No newline at end of file |