]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #4170 from MrPetovan/bug/4155-remove-proxy-oembed
authorHypolite Petovan <mrpetovan@gmail.com>
Thu, 4 Jan 2018 21:34:02 +0000 (16:34 -0500)
committerGitHub <noreply@github.com>
Thu, 4 Jan 2018 21:34:02 +0000 (16:34 -0500)
Fix typo in OEmbed

68 files changed:
boot.php
doc/htconfig.md
include/acl_selectors.php
include/api.php
include/auth.php [deleted file]
include/bbcode.php
include/contact_widgets.php
include/conversation.php
include/datetime.php
include/enotify.php
include/event.php
include/files.php
include/follow.php
include/html2plain.php
include/identity.php
include/items.php
include/like.php
include/message.php
include/nav.php
include/network.php
include/plaintext.php
include/plugin.php
include/post_update.php
include/profile_selectors.php
include/queue_fn.php
include/redir.php
include/security.php
include/session.php
include/tags.php
include/text.php
index.php
mod/admin.php
mod/api.php
mod/bookmarklet.php
mod/cal.php
mod/community.php
mod/dfrn_poll.php
mod/dfrn_request.php
mod/display.php
mod/events.php
mod/home.php
mod/item.php
mod/login.php [deleted file]
mod/network.php
mod/notify.php
mod/oexchange.php
mod/photos.php
mod/profile.php
mod/profiles.php
mod/regmod.php
mod/settings.php
mod/subthread.php
mod/update_community.php
mod/videos.php
src/BaseObject.php
src/Core/System.php
src/Model/Group.php
src/Model/User.php
src/Module/Login.php [new file with mode: 0644]
src/Module/Logout.php [new file with mode: 0644]
src/Object/Post.php
src/Object/Thread.php
src/Protocol/DFRN.php
src/Protocol/Diaspora.php
src/Worker/Delivery.php
view/theme/frio/php/default.php
view/theme/quattro/templates/nav.tpl
view/theme/smoothly/templates/nav.tpl

index 8c3cd786f54dd5de79a074e143c528e77959aa0c..5607260d9749114051b748a490fa96b0d17d2c0e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -29,6 +29,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Database\DBStructure;
+use Friendica\Module\Login;
 
 require_once 'include/network.php';
 require_once 'include/plugin.php';
@@ -228,9 +229,10 @@ define('ACCOUNT_TYPE_COMMUNITY',   3);
  * Type of the community page
  * @{
  */
-define('CP_NO_COMMUNITY_PAGE',   -1);
+define('CP_NO_COMMUNITY_PAGE',  -1);
 define('CP_USERS_ON_SERVER',     0);
 define('CP_GLOBAL_COMMUNITY',    1);
+define('CP_USERS_AND_GLOBAL',    2);
 /**
  * @}
  */
@@ -674,7 +676,7 @@ function check_db($via_worker)
        if ($build != DB_UPDATE_VERSION) {
                // When we cannot execute the database update via the worker, we will do it directly
                if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
-                       update_db(get_app());
+                       update_db();
                }
        }
 }
@@ -695,11 +697,8 @@ function check_url(App $a)
        // and www.example.com vs example.com.
        // We will only change the url to an ip address if there is no existing setting
 
-       if (empty($url)) {
-               $url = Config::set('system', 'url', System::baseUrl());
-       }
-       if ((!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
-               $url = Config::set('system', 'url', System::baseUrl());
+       if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
+               Config::set('system', 'url', System::baseUrl());
        }
 
        return;
@@ -709,7 +708,7 @@ function check_url(App $a)
  * @brief Automatic database updates
  * @param object $a App
  */
-function update_db(App $a)
+function update_db()
 {
        $build = Config::get('system', 'build');
 
@@ -798,7 +797,6 @@ function run_update_function($x)
                Config::set('system', 'build', $x + 1);
                return true;
        }
-       return true;
 }
 
 /**
@@ -877,83 +875,6 @@ function get_guid($size = 16, $prefix = "")
        }
 }
 
-/**
- * @brief Wrapper for adding a login box.
- *
- * @param bool $register If $register == true provide a registration link.
- *                                              This will most always depend on the value of $a->config['register_policy'].
- * @param bool $hiddens  optional
- *
- * @return string Returns the complete html for inserting into the page
- *
- * @hooks 'login_hook'
- *     string $o
- */
-function login($register = false, $hiddens = false)
-{
-       $a = get_app();
-       $o = "";
-       $reg = false;
-       if ($register) {
-               $reg = array(
-                       'title' => t('Create a New Account'),
-                       'desc' => t('Register')
-               );
-       }
-
-       $noid = Config::get('system', 'no_openid');
-
-       $dest_url = $a->query_string;
-
-       if (local_user()) {
-               $tpl = get_markup_template("logout.tpl");
-       } else {
-               $a->page['htmlhead'] .= replace_macros(
-                       get_markup_template("login_head.tpl"),
-                       array(
-                       '$baseurl' => $a->get_baseurl(true)
-                       )
-               );
-
-               $tpl = get_markup_template("login.tpl");
-               $_SESSION['return_url'] = $a->query_string;
-               $a->module = 'login';
-       }
-
-       $o .= replace_macros(
-               $tpl,
-               array(
-               '$dest_url'     => $dest_url,
-               '$logout'       => t('Logout'),
-               '$login'        => t('Login'),
-
-               '$lname'        => array('username', t('Nickname or Email: ') , '', ''),
-               '$lpassword'    => array('password', t('Password: '), '', ''),
-               '$lremember'    => array('remember', t('Remember me'), 0,  ''),
-
-               '$openid'       => !$noid,
-               '$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
-
-               '$hiddens'      => $hiddens,
-
-               '$register'     => $reg,
-
-               '$lostpass'     => t('Forgot your password?'),
-               '$lostlink'     => t('Password Reset'),
-
-               '$tostitle'     => t('Website Terms of Service'),
-               '$toslink'      => t('terms of service'),
-
-               '$privacytitle' => t('Website Privacy Policy'),
-               '$privacylink'  => t('privacy policy'),
-               )
-       );
-
-       call_hooks('login_hook', $o);
-
-       return $o;
-}
-
 /**
  * @brief Used to end the current process, after saving session state.
  */
@@ -969,13 +890,15 @@ function killme()
 /**
  * @brief Redirect to another URL and terminate this process.
  */
-function goaway($s)
+function goaway($path)
 {
-       if (!strstr(normalise_link($s), "http://")) {
-               $s = System::baseUrl() . "/" . $s;
+       if (strstr(normalise_link($path), 'http://')) {
+               $url = $path;
+       } else {
+               $url = System::baseUrl() . '/' . ltrim($path, '/');
        }
 
-       header("Location: $s");
+       header("Location: $url");
        killme();
 }
 
@@ -1124,7 +1047,6 @@ function current_theme()
 
        if ($is_mobile) {
                if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-                       $system_theme = $standard_system_theme;
                        $theme_name = $standard_theme_name;
                } else {
                        $system_theme = Config::get('system', 'mobile-theme', '');
@@ -1135,7 +1057,6 @@ function current_theme()
 
                        if ($theme_name === '---') {
                                // user has selected to have the mobile theme be the same as the normal one
-                               $system_theme = $standard_system_theme;
                                $theme_name = $standard_theme_name;
 
                                if ($page_theme) {
@@ -1144,7 +1065,6 @@ function current_theme()
                        }
                }
        } else {
-               $system_theme = $standard_system_theme;
                $theme_name = $standard_theme_name;
 
                if ($page_theme) {
index c2c2f536bcf02de5b83bef32c49f4a5beac4935f..f601bdca9ed40ae6997541672b21fb9804d6d199 100644 (file)
@@ -25,7 +25,6 @@ Example: To set the directory value please add this line to your .htconfig.php:
 
 * **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed.
 * **always_show_preview** (Boolean) - Only show small preview picures. Default value is false.
-* **birthday_input_format** - Default value is "ymd".
 * **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
 * **auth_cookie_lifetime** (Integer) - Number of days that should pass without any activity before a user who chose "Remember me" when logging in is considered logged out. Defaults to 7.
 * **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
@@ -43,7 +42,6 @@ Example: To set the directory value please add this line to your .htconfig.php:
 * **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
 * **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL.
 * **dlogfile - location of the developer log file
-* **event_input_format** - Default value is "ymd".
 * **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10.
 * **hsts** (Boolean) - Enables the sending of HTTP Strict Transport Security headers
 * **ignore_cache** (Boolean) - For development only. Disables the item cache.
index 7a488ca40bb6511b211ea57c2d45703373787e9a..02ab95bb1efaff48d3d080afe604aaf9553cdffd 100644 (file)
@@ -386,59 +386,20 @@ function populate_acl($user = null, $show_jotnets = false) {
 
 }
 
-function construct_acl_data(App $a, $user) {
-       // This function is now deactivated. It seems as if the generated data isn't used anywhere.
-       /// @todo Remove this function and all function calls before releasing Friendica 3.5.3
-       return;
-
-       // Get group and contact information for html ACL selector
-       $acl_data = acl_lookup($a, 'html');
-
-       $user_defaults = get_acl_permissions($user);
-
-       if ($acl_data['groups']) {
-               foreach ($acl_data['groups'] as $key => $group) {
-                       // Add a "selected" flag to groups that are posted to by default
-                       if ($user_defaults['allow_gid'] &&
-                                       in_array($group['id'], $user_defaults['allow_gid']) && !in_array($group['id'], $user_defaults['deny_gid']) ) {
-                               $acl_data['groups'][$key]['selected'] = 1;
-                       } else {
-                               $acl_data['groups'][$key]['selected'] = 0;
-                       }
-               }
-       }
-       if ($acl_data['contacts']) {
-               foreach ($acl_data['contacts'] as $key => $contact) {
-                       // Add a "selected" flag to groups that are posted to by default
-                       if ($user_defaults['allow_cid'] &&
-                                       in_array($contact['id'], $user_defaults['allow_cid']) && !in_array($contact['id'], $user_defaults['deny_cid']) ) {
-                               $acl_data['contacts'][$key]['selected'] = 1;
-                       } else {
-                               $acl_data['contacts'][$key]['selected'] = 0;
-                       }
-               }
-       }
-
-       return $acl_data;
-
-}
-
-function acl_lookup(App $a, $out_type = 'json') {
-
+function acl_lookup(App $a, $out_type = 'json')
+{
        if (!local_user()) {
                return '';
        }
 
-       $start  =       (x($_REQUEST,'start')           ? $_REQUEST['start']            : 0);
-       $count  =       (x($_REQUEST,'count')           ? $_REQUEST['count']            : 100);
-       $search  =      (x($_REQUEST,'search')          ? $_REQUEST['search']           : "");
-       $type   =       (x($_REQUEST,'type')            ? $_REQUEST['type']             : "");
-       $mode   =       (x($_REQUEST,'smode')           ? $_REQUEST['smode']            : "");
-       $conv_id =      (x($_REQUEST,'conversation')    ? $_REQUEST['conversation']     : null);
+       $start   = defaults($_REQUEST, 'start'       , 0);
+       $count   = defaults($_REQUEST, 'count'       , 100);
+       $search  = defaults($_REQUEST, 'search'      , '');
+       $type    = defaults($_REQUEST, 'type'        , '');
+       $conv_id = defaults($_REQUEST, 'conversation', null);
 
        // For use with jquery.textcomplete for private mail completion
-
-       if (x($_REQUEST, 'query') && strlen($_REQUEST['query'])) {
+       if (x($_REQUEST, 'query')) {
                if (! $type) {
                        $type = 'm';
                }
@@ -447,7 +408,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 
        logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
 
-       if ($search != "") {
+       if ($search != '') {
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
                $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
        } else {
@@ -490,7 +451,6 @@ function acl_lookup(App $a, $out_type = 'json') {
                $contact_count = (int)$r[0]['c'];
        } elseif ($type == 'm') {
                // autocomplete for Private Messages
-
                $r = q("SELECT COUNT(*) AS c FROM `contact`
                                WHERE `uid` = %d AND NOT `self`
                                AND NOT `blocked` AND NOT `pending` AND NOT `archive`
@@ -503,28 +463,23 @@ function acl_lookup(App $a, $out_type = 'json') {
                $contact_count = (int)$r[0]['c'];
 
        } elseif ($type == 'a') {
-
                // autocomplete for Contacts
-
                $r = q("SELECT COUNT(*) AS c FROM `contact`
                                WHERE `uid` = %d AND NOT `self`
                                AND NOT `pending` $sql_extra2" ,
                        intval(local_user())
                );
                $contact_count = (int)$r[0]['c'];
-
        } else {
                $contact_count = 0;
        }
 
-
-       $tot = $group_count+$contact_count;
+       $tot = $group_count + $contact_count;
 
        $groups = array();
        $contacts = array();
 
        if ($type == '' || $type == 'g') {
-
                /// @todo We should cache this query.
                // This can be done when we can delete cache entries via wildcard
                $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
@@ -541,7 +496,6 @@ function acl_lookup(App $a, $out_type = 'json') {
                );
 
                foreach ($r as $g) {
-//             logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);
                        $groups[] = array(
                                "type"  => "g",
                                "photo" => "images/twopeople.png",
@@ -558,7 +512,6 @@ function acl_lookup(App $a, $out_type = 'json') {
        }
 
        if ($type == '') {
-
                $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv`, (`prv` OR `forum`) AS `frm` FROM `contact`
                        WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
                        AND `success_update` >= `failure_update` AND NOT (`network` IN ('%s', '%s'))
@@ -630,7 +583,6 @@ function acl_lookup(App $a, $out_type = 'json') {
                $r = array();
        }
 
-
        if (DBM::is_result($r)) {
                $forums = array();
                foreach ($r as $g) {
@@ -781,11 +733,10 @@ function navbar_complete(App $a) {
        if (! $localsearch) {
                $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
-               $x = z_fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
+               $x = z_fetch_url(get_server() . '/lsearch?f=' . $p .  '&search=' . urlencode($search));
                if ($x['success']) {
-                       $t = 0;
                        $j = json_decode($x['body'],true);
-                       if ($j && $j['results']) {
+                       if ($j && isset($j['results'])) {
                                return $j['results'];
                        }
                }
index e8e2295b82155e9303ad701f0fe32c7a14bce6fc..e527cb003bb756b5bb94f4d0f8efae1bc020de50 100644 (file)
@@ -304,7 +304,7 @@ function api_call(App $a)
                                logger('API parameters: ' . print_r($_REQUEST, true));
 
                                $stamp =  microtime(true);
-                               $r = call_user_func($info['func'], $type);
+                               $return = call_user_func($info['func'], $type);
                                $duration = (float) (microtime(true) - $stamp);
                                logger("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG);
 
@@ -352,7 +352,7 @@ function api_call(App $a)
                                        }
                                }
 
-                               if (false === $r) {
+                               if (false === $return) {
                                        /*
                                                * api function returned false withour throw an
                                                * exception. This should not happend, throw a 500
@@ -363,27 +363,27 @@ function api_call(App $a)
                                switch ($type) {
                                        case "xml":
                                                header("Content-Type: text/xml");
-                                               return $r;
                                                break;
                                        case "json":
                                                header("Content-Type: application/json");
-                                               foreach ($r as $rr) {
+                                               foreach ($return as $rr) {
                                                        $json = json_encode($rr);
                                                }
                                                if (x($_GET, 'callback')) {
                                                        $json = $_GET['callback'] . "(" . $json . ")";
                                                }
-                                               return $json;
+                                               $return = $json;
                                                break;
                                        case "rss":
                                                header("Content-Type: application/rss+xml");
-                                               return '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $r;
+                                               $return  = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $return;
                                                break;
                                        case "atom":
                                                header("Content-Type: application/atom+xml");
-                                               return '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $r;
+                                               $return = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $return;
                                                break;
                                }
+                               return $return;
                        }
                }
 
@@ -413,26 +413,25 @@ function api_error($type, $e)
                        "code" => $e->httpcode . " " . $e->httpdesc,
                        "request" => $a->query_string);
 
-       $ret = api_format_data('status', $type, array('status' => $error));
+       $return = api_format_data('status', $type, array('status' => $error));
 
        switch ($type) {
                case "xml":
                        header("Content-Type: text/xml");
-                       return $ret;
                        break;
                case "json":
                        header("Content-Type: application/json");
-                       return json_encode($ret);
+                       $return = json_encode($return);
                        break;
                case "rss":
                        header("Content-Type: application/rss+xml");
-                       return $ret;
                        break;
                case "atom":
                        header("Content-Type: application/atom+xml");
-                       return $ret;
                        break;
        }
+
+       return $return;
 }
 
 /**
@@ -496,7 +495,6 @@ function api_get_user(App $a, $contact_id = null)
        $user = null;
        $extra_query = "";
        $url = "";
-       $nick = "";
 
        logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG);
 
@@ -540,7 +538,6 @@ function api_get_user(App $a, $contact_id = null)
        }
        if (is_null($user) && x($_GET, 'screen_name')) {
                $user = dbesc($_GET['screen_name']);
-               $nick = $user;
                $extra_query = "AND `contact`.`nick` = '%s' ";
                if (api_user() !== false) {
                        $extra_query .= "AND `contact`.`uid`=".intval(api_user());
@@ -549,7 +546,6 @@ function api_get_user(App $a, $contact_id = null)
 
        if (is_null($user) && x($_GET, 'profileurl')) {
                $user = dbesc(normalise_link($_GET['profileurl']));
-               $nick = $user;
                $extra_query = "AND `contact`.`nurl` = '%s' ";
                if (api_user() !== false) {
                        $extra_query .= "AND `contact`.`uid`=".intval(api_user());
@@ -573,7 +569,6 @@ function api_get_user(App $a, $contact_id = null)
                        }
                } else {
                        $user = dbesc($user);
-                       $nick = $user;
                        $extra_query = "AND `contact`.`nick` = '%s' ";
                        if (api_user() !== false) {
                                $extra_query .= "AND `contact`.`uid`=" . intval(api_user());
@@ -1116,12 +1111,9 @@ function api_statuses_update($type)
                throw new ForbiddenException();
        }
 
-       $user_info = api_get_user($a);
+       api_get_user($a);
 
        // convert $_POST array items to the form we use for web posts.
-
-       // logger('api_post: ' . print_r($_POST,true));
-
        if (requestdata('htmlstatus')) {
                $txt = requestdata('htmlstatus');
                if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
@@ -1284,12 +1276,10 @@ api_register_func('api/statuses/update_with_media', 'api_statuses_update', true,
 /**
  * Uploads an image to Friendica.
  *
- * @param string $type Return type (atom, rss, xml, json)
- *
  * @return array
  * @see https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload
  */
-function api_media_upload($type)
+function api_media_upload()
 {
        $a = get_app();
 
@@ -1298,7 +1288,7 @@ function api_media_upload($type)
                throw new ForbiddenException();
        }
 
-       $user_info = api_get_user($a);
+       api_get_user($a);
 
        if (!x($_FILES, 'media')) {
                // Output error
@@ -1537,8 +1527,6 @@ function api_users_search($type)
 {
        $a = get_app();
 
-       $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
-
        $userlist = array();
 
        if (x($_GET, 'q')) {
@@ -1566,6 +1554,7 @@ function api_users_search($type)
        } else {
                throw new BadRequestException("User not found.");
        }
+
        return api_format_data("users", $type, $userlist);
 }
 
@@ -1748,7 +1737,7 @@ function api_statuses_home_timeline($type)
                $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `id` IN (%s)", $idlist);
 
                if ($unseen) {
-                       $r = q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` AND `id` IN (%s)", $idlist);
+                       q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` AND `id` IN (%s)", $idlist);
                }
        }
 
@@ -2127,7 +2116,7 @@ function api_statuses_repeat($type)
                throw new ForbiddenException();
        }
 
-       $user_info = api_get_user($a);
+       api_get_user($a);
 
        // params
        $id = intval($a->argv[3]);
@@ -2207,7 +2196,7 @@ function api_statuses_destroy($type)
                throw new ForbiddenException();
        }
 
-       $user_info = api_get_user($a);
+       api_get_user($a);
 
        // params
        $id = intval($a->argv[3]);
@@ -2259,23 +2248,20 @@ function api_statuses_mentions($type)
 
 
        // params
-       $count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
-       $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
-       if ($page < 0) {
-               $page = 0;
+       $since_id = defaults($_REQUEST, 'since_id', 0);
+       $max_id   = defaults($_REQUEST, 'max_id'  , 0);
+       $count    = defaults($_REQUEST, 'count'   , 20);
+       $page     = defaults($_REQUEST, 'page'    , 1);
+       if ($page < 1) {
+               $page = 1;
        }
-       $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-       $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
-       //$since_id = 0;//$since_id = (x($_REQUEST, 'since_id')?$_REQUEST['since_id'] : 0);
 
-       $start = $page * $count;
+       $start = ($page - 1) * $count;
 
        // Ugly code - should be changed
        $myurl = System::baseUrl() . '/profile/'. $a->user['nickname'];
        $myurl = substr($myurl, strpos($myurl, '://') + 3);
-       //$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
        $myurl = str_replace('www.', '', $myurl);
-       $diasp_url = str_replace('/profile/', '/u/', $myurl);
 
        if ($max_id > 0) {
                $sql_extra = ' AND `item`.`id` <= ' . intval($max_id);
@@ -2751,8 +2737,6 @@ function api_get_attachments(&$body)
  */
 function api_get_entitities(&$text, $bbcode)
 {
-       $a = get_app();
-
        $include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
 
        if ($include_entities != "true") {
@@ -2917,19 +2901,18 @@ function api_get_entitities(&$text, $bbcode)
  *
  * @return string
  */
-function api_format_items_embeded_images(&$item, $text)
+function api_format_items_embeded_images($item, $text)
 {
        $text = preg_replace_callback(
-               "|data:image/([^;]+)[^=]+=*|m",
-               function ($match) use ($item) {
-                       return System::baseUrl()."/display/".$item['guid'];
+               '|data:image/([^;]+)[^=]+=*|m',
+               function () use ($item) {
+                       return System::baseUrl() . '/display/' . $item['guid'];
                },
                $text
        );
        return $text;
 }
 
-
 /**
  * @brief return <a href='url'>name</a> as array
  *
@@ -3034,54 +3017,53 @@ function api_format_items_activities(&$item, $type = "json")
 /**
  * @brief return data from profiles
  *
- * @param array  $profile array containing data from db table 'profile'
- * @param string $type    Known types are 'atom', 'rss', 'xml' and 'json'
+ * @param array  $profile_row array containing data from db table 'profile'
  * @return array
  */
-function api_format_items_profiles(&$profile = null, $type = "json")
+function api_format_items_profiles($profile_row)
 {
-       if ($profile != null) {
-               $profile = array('profile_id' => $profile['id'],
-                                               'profile_name' => $profile['profile-name'],
-                                               'is_default' => $profile['is-default'] ? true : false,
-                                               'hide_friends'=> $profile['hide-friends'] ? true : false,
-                                               'profile_photo' => $profile['photo'],
-                                               'profile_thumb' => $profile['thumb'],
-                                               'publish' => $profile['publish'] ? true : false,
-                                               'net_publish' => $profile['net-publish'] ? true : false,
-                                               'description' => $profile['pdesc'],
-                                               'date_of_birth' => $profile['dob'],
-                                               'address' => $profile['address'],
-                                               'city' => $profile['locality'],
-                                               'region' => $profile['region'],
-                                               'postal_code' => $profile['postal-code'],
-                                               'country' => $profile['country-name'],
-                                               'hometown' => $profile['hometown'],
-                                               'gender' => $profile['gender'],
-                                               'marital' => $profile['marital'],
-                                               'marital_with' => $profile['with'],
-                                               'marital_since' => $profile['howlong'],
-                                               'sexual' => $profile['sexual'],
-                                               'politic' => $profile['politic'],
-                                               'religion' => $profile['religion'],
-                                               'public_keywords' => $profile['pub_keywords'],
-                                               'private_keywords' => $profile['prv_keywords'],
-                                               'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, false),
-                                               'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, false),
-                                               'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, false),
-                                               'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, false),
-                                               'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, false),
-                                               'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, false),
-                                               'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, false),
-                                               'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, false),
-                                               'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, false),
-                                               'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, false),
-                                               'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, false),
-                                               'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, false),
-                                               'homepage' => $profile['homepage'],
-                                               'users' => null);
-               return $profile;
-       }
+       $profile = array(
+               'profile_id'       => $profile_row['id'],
+               'profile_name'     => $profile_row['profile-name'],
+               'is_default'       => $profile_row['is-default'] ? true : false,
+               'hide_friends'     => $profile_row['hide-friends'] ? true : false,
+               'profile_photo'    => $profile_row['photo'],
+               'profile_thumb'    => $profile_row['thumb'],
+               'publish'          => $profile_row['publish'] ? true : false,
+               'net_publish'      => $profile_row['net-publish'] ? true : false,
+               'description'      => $profile_row['pdesc'],
+               'date_of_birth'    => $profile_row['dob'],
+               'address'          => $profile_row['address'],
+               'city'             => $profile_row['locality'],
+               'region'           => $profile_row['region'],
+               'postal_code'      => $profile_row['postal-code'],
+               'country'          => $profile_row['country-name'],
+               'hometown'         => $profile_row['hometown'],
+               'gender'           => $profile_row['gender'],
+               'marital'          => $profile_row['marital'],
+               'marital_with'     => $profile_row['with'],
+               'marital_since'    => $profile_row['howlong'],
+               'sexual'           => $profile_row['sexual'],
+               'politic'          => $profile_row['politic'],
+               'religion'         => $profile_row['religion'],
+               'public_keywords'  => $profile_row['pub_keywords'],
+               'private_keywords' => $profile_row['prv_keywords'],
+               'likes'            => bbcode(api_clean_plain_items($profile_row['likes'])    , false, false, 2, false),
+               'dislikes'         => bbcode(api_clean_plain_items($profile_row['dislikes']) , false, false, 2, false),
+               'about'            => bbcode(api_clean_plain_items($profile_row['about'])    , false, false, 2, false),
+               'music'            => bbcode(api_clean_plain_items($profile_row['music'])    , false, false, 2, false),
+               'book'             => bbcode(api_clean_plain_items($profile_row['book'])     , false, false, 2, false),
+               'tv'               => bbcode(api_clean_plain_items($profile_row['tv'])       , false, false, 2, false),
+               'film'             => bbcode(api_clean_plain_items($profile_row['film'])     , false, false, 2, false),
+               'interest'         => bbcode(api_clean_plain_items($profile_row['interest']) , false, false, 2, false),
+               'romance'          => bbcode(api_clean_plain_items($profile_row['romance'])  , false, false, 2, false),
+               'work'             => bbcode(api_clean_plain_items($profile_row['work'])     , false, false, 2, false),
+               'education'        => bbcode(api_clean_plain_items($profile_row['education']), false, false, 2, false),
+               'social_networks'  => bbcode(api_clean_plain_items($profile_row['contact'])  , false, false, 2, false),
+               'homepage'         => $profile_row['homepage'],
+               'users'            => null
+       );
+       return $profile;
 }
 
 /**
@@ -3541,21 +3523,18 @@ api_register_func('api/statusnet/version', 'api_statusnet_version', false);
 /**
  *
  * @param string $type Return type (atom, rss, xml, json)
- * @param string $qtype
  *
  * @todo use api_format_data() to return data
  */
-function api_ff_ids($type, $qtype)
+function api_ff_ids($type)
 {
-       $a = get_app();
-
        if (! api_user()) {
                throw new ForbiddenException();
        }
 
-       $user_info = api_get_user($a);
+       api_get_user($a);
 
-       $stringify_ids = (x($_REQUEST, 'stringify_ids') ? $_REQUEST['stringify_ids'] : false);
+       $stringify_ids = defaults($_REQUEST, 'stringify_ids', false);
 
        $r = q(
                "SELECT `pcontact`.`id` FROM `contact`
@@ -3563,7 +3542,6 @@ function api_ff_ids($type, $qtype)
                        WHERE `contact`.`uid` = %s AND NOT `contact`.`self`",
                intval(api_user())
        );
-
        if (!DBM::is_result($r)) {
                return;
        }
@@ -3590,7 +3568,7 @@ function api_ff_ids($type, $qtype)
  */
 function api_friends_ids($type)
 {
-       return api_ff_ids($type, 'friends');
+       return api_ff_ids($type);
 }
 
 /**
@@ -3603,7 +3581,7 @@ function api_friends_ids($type)
  */
 function api_followers_ids($type)
 {
-       return api_ff_ids($type, 'followers');
+       return api_ff_ids($type);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -3930,10 +3908,9 @@ api_register_func('api/direct_messages', 'api_direct_messages_inbox', true);
 /**
  * Returns an OAuth Request Token.
  *
- * @param string $type Return type (atom, rss, xml, json)
  * @see https://oauth.net/core/1.0/#auth_step1
  */
-function api_oauth_request_token($type)
+function api_oauth_request_token()
 {
        $oauth1 = new FKOAuth1();
        try {
@@ -3949,12 +3926,10 @@ function api_oauth_request_token($type)
 /**
  * Returns an OAuth Access Token.
  *
- * @param string $type Return type (atom, rss, xml, json)
- *
  * @return array|string
  * @see https://oauth.net/core/1.0/#auth_step3
  */
-function api_oauth_access_token($type)
+function api_oauth_access_token()
 {
        $oauth1 = new FKOAuth1();
        try {
@@ -4366,7 +4341,7 @@ function api_account_update_profile_image($type)
                throw new ForbiddenException();
        }
        // input params
-       $profileid = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0);
+       $profileid = defaults($_REQUEST, 'profile_id', 0);
 
        // error if image data is missing
        if (!x($_FILES, 'image')) {
@@ -4412,13 +4387,13 @@ function api_account_update_profile_image($type)
        }
        // change specified profile or all profiles to the new resource-id
        if ($is_default_profile) {
-               $r = q(
+               q(
                        "UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
                        dbesc($data['photo']['id']),
                        intval(local_user())
                );
 
-               $r = q(
+               q(
                        "UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s'  WHERE `self` AND `uid` = %d",
                        dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $fileext),
                        dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $fileext),
@@ -4426,7 +4401,7 @@ function api_account_update_profile_image($type)
                        intval(local_user())
                );
        } else {
-               $r = q(
+               q(
                        "UPDATE `profile` SET `photo` = '%s', `thumb` = '%s' WHERE `id` = %d AND `uid` = %d",
                        dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $filetype),
                        dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $filetype),
@@ -4438,7 +4413,7 @@ function api_account_update_profile_image($type)
        // we'll set the updated profile-photo timestamp even if it isn't the default profile,
        // so that browsers will do a cache update unconditionally
 
-       $r = q(
+       q(
                "UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
                dbesc(datetime_convert()),
                intval(local_user())
@@ -4903,7 +4878,7 @@ function api_friendica_remoteauth()
 
        $cid = $r['id'];
 
-       $dfrn_id = $orig_id = (($r['issued-id']) ? $r['issued-id'] : $r['dfrn-id']);
+       $dfrn_id = defaults($r, 'issued-id', $r['dfrn-id']);
 
        if ($r['duplex'] && $r['issued-id']) {
                $orig_id = $r['issued-id'];
@@ -5503,7 +5478,7 @@ function api_friendica_group_create($type)
                        intval($uid)
                );
                if (count($contact)) {
-                       $result = Group::addMember($gid, $cid);
+                       Group::addMember($gid, $cid);
                } else {
                        $erroraddinguser = true;
                        $errorusers[] = $cid;
@@ -5559,7 +5534,7 @@ function api_friendica_group_update($type)
                        $found = ($user['cid'] == $cid ? true : false);
                }
                if (!$found) {
-                       $ret = Group::removeMemberByName($uid, $name, $cid);
+                       Group::removeMemberByName($uid, $name, $cid);
                }
        }
 
@@ -5576,7 +5551,7 @@ function api_friendica_group_update($type)
                );
 
                if (count($contact)) {
-                       $result = Group::addMember($gid, $cid);
+                       Group::addMember($gid, $cid);
                } else {
                        $erroraddinguser = true;
                        $errorusers[] = $cid;
@@ -5880,7 +5855,7 @@ function api_friendica_profile_show($type)
        // loop through all returned profiles and retrieve data and users
        $k = 0;
        foreach ($r as $rr) {
-               $profile = api_format_items_profiles($rr, $type);
+               $profile = api_format_items_profiles($rr);
 
                // select all users from contact table, loop and prepare standard return for user data
                $users = array();
diff --git a/include/auth.php b/include/auth.php
deleted file mode 100644 (file)
index a02c18d..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Core\System;
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use Friendica\Model\User;
-
-require_once 'include/security.php';
-require_once 'include/datetime.php';
-
-// When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.
-if (isset($_COOKIE["Friendica"])) {
-       $data = json_decode($_COOKIE["Friendica"]);
-       if (isset($data->uid)) {
-
-               $user = dba::select('user',
-                       [],
-                       [
-                               'uid'             => $data->uid,
-                               'blocked'         => false,
-                               'account_expired' => false,
-                               'account_removed' => false,
-                               'verified'        => true,
-                       ],
-                       ['limit' => 1]
-               );
-
-               if (DBM::is_result($user)) {
-                       if ($data->hash != cookie_hash($user)) {
-                               logger("Hash for user " . $data->uid . " doesn't fit.");
-                               nuke_session();
-                               goaway(System::baseUrl());
-                       }
-
-                       // Renew the cookie
-                       // Expires after 7 days by default,
-                       // can be set via system.auth_cookie_lifetime
-                       $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);
-                       new_cookie($authcookiedays * 24 * 60 * 60, $user);
-
-                       // Do the authentification if not done by now
-                       if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
-                               authenticate_success($user);
-
-                               if (Config::get('system', 'paranoia')) {
-                                       $_SESSION['addr'] = $data->ip;
-                               }
-                       }
-               }
-       }
-}
-
-
-// login/logout
-
-if (isset($_SESSION) && x($_SESSION, 'authenticated') && (!x($_POST, 'auth-params') || ($_POST['auth-params'] !== 'login'))) {
-       if ((x($_POST, 'auth-params') && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
-               // process logout request
-               call_hooks("logging_out");
-               nuke_session();
-               info(t('Logged out.') . EOL);
-               goaway(System::baseUrl());
-       }
-
-       if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-                       intval($_SESSION['visitor_id'])
-               );
-               if (DBM::is_result($r)) {
-                       $a->contact = $r[0];
-               }
-       }
-
-       if (x($_SESSION, 'uid')) {
-               // already logged in user returning
-               $check = Config::get('system', 'paranoia');
-               // extra paranoia - if the IP changed, log them out
-               if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
-                       logger('Session address changed. Paranoid setting in effect, blocking session. ' .
-                               $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
-                       nuke_session();
-                       goaway(System::baseUrl());
-               }
-
-               $user = dba::select('user',
-                       [],
-                       [
-                               'uid'             => $_SESSION['uid'],
-                               'blocked'         => false,
-                               'account_expired' => false,
-                               'account_removed' => false,
-                               'verified'        => true,
-                       ],
-                       ['limit' => 1]
-               );
-               if (!DBM::is_result($user)) {
-                       nuke_session();
-                       goaway(System::baseUrl());
-               }
-
-               // Make sure to refresh the last login time for the user if the user
-               // stays logged in for a long time, e.g. with "Remember Me"
-               $login_refresh = false;
-               if (!x($_SESSION['last_login_date'])) {
-                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
-               }
-               if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {
-                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
-                       $login_refresh = true;
-               }
-               authenticate_success($user, false, false, $login_refresh);
-       }
-} else {
-       session_unset();
-       if (
-               !(x($_POST, 'password') && strlen($_POST['password']))
-               && (
-                       x($_POST, 'openid_url') && strlen($_POST['openid_url'])
-                       || x($_POST, 'username') && strlen($_POST['username'])
-               )
-       ) {
-               $noid = Config::get('system', 'no_openid');
-
-               $openid_url = trim(strlen($_POST['openid_url']) ? $_POST['openid_url'] : $_POST['username']);
-
-               // validate_url alters the calling parameter
-
-               $temp_string = $openid_url;
-
-               // if it's an email address or doesn't resolve to a URL, fail.
-
-               if ($noid || strpos($temp_string, '@') || !validate_url($temp_string)) {
-                       $a = get_app();
-                       notice(t('Login failed.') . EOL);
-                       goaway(System::baseUrl());
-                       // NOTREACHED
-               }
-
-               // Otherwise it's probably an openid.
-
-               try {
-                       require_once('library/openid.php');
-                       $openid = new LightOpenID;
-                       $openid->identity = $openid_url;
-                       $_SESSION['openid'] = $openid_url;
-                       $_SESSION['remember'] = $_POST['remember'];
-                       $openid->returnUrl = System::baseUrl(true) . '/openid';
-                       goaway($openid->authUrl());
-               } catch (Exception $e) {
-                       notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . t('The error message was:') . ' ' . $e->getMessage());
-               }
-               // NOTREACHED
-       }
-
-       if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {
-               $record = null;
-
-               $addon_auth = array(
-                       'username' => trim($_POST['username']),
-                       'password' => trim($_POST['password']),
-                       'authenticated' => 0,
-                       'user_record' => null
-               );
-
-               /**
-                *
-                * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record
-                * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
-                * and later plugins should not interfere with an earlier one that succeeded.
-                *
-                */
-               call_hooks('authenticate', $addon_auth);
-
-               if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {
-                       $record = $addon_auth['user_record'];
-               } else {
-                       $user_id = User::authenticate(trim($_POST['username']), trim($_POST['password']));
-                       if ($user_id) {
-                               $record = dba::select('user', [], ['uid' => $user_id], ['limit' => 1]);
-                       }
-               }
-
-               if (!$record || !count($record)) {
-                       logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
-                       notice(t('Login failed.') . EOL);
-                       goaway(System::baseUrl());
-               }
-
-               if (!$_POST['remember']) {
-                       new_cookie(0); // 0 means delete on browser exit
-               }
-
-               // if we haven't failed up this point, log them in.
-               $_SESSION['remember'] = $_POST['remember'];
-               $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');
-               authenticate_success($record, true, true);
-       }
-}
-
-/**
- * @brief Kills the "Friendica" cookie and all session data
- */
-function nuke_session()
-{
-       new_cookie(-3600); // make sure cookie is deleted on browser close, as a security measure
-       session_unset();
-       session_destroy();
-}
index 261bdfcf660cc69034a5c927088a77a08aaf0bd8..87a8eaa9b38d6518c57c779e0cf026d5567737bf 100644 (file)
@@ -67,8 +67,6 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
        } else {
                if ($simplehtml != 4) {
                        $text = sprintf('<span class="type-%s">', $data["type"]);
-               } else {
-                       $span_end = '';
                }
 
                $bookmark = array(sprintf('[bookmark=%s]%s[/bookmark]', $data["url"], $data["title"]), $data["url"], $data["title"]);
@@ -270,7 +268,6 @@ function bb_spacefy($st) {
  * returning [i]italic[/i]
  */
 function bb_unspacefy_and_trim($st) {
-       $whole_match = $st[0];
        $captured = $st[1];
        $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured);
        return $unspacefied;
index 9c44f4d15695027027a5f756f8cfb93a1f62d92f..55e119c3fa55617b27c64d69ce3f39d465e82c2e 100644 (file)
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file include/contact_widgets.php
  */
@@ -11,8 +12,8 @@ use Friendica\Model\GContact;
 
 require_once 'include/contact_selectors.php';
 
-function follow_widget($value = "") {
-
+function follow_widget($value = "")
+{
        return replace_macros(get_markup_template('follow.tpl'), array(
                '$connect' => t('Add New Contact'),
                '$desc' => t('Enter address or web location'),
@@ -20,10 +21,10 @@ function follow_widget($value = "") {
                '$value' => $value,
                '$follow' => t('Connect')
        ));
-
 }
 
-function findpeople_widget() {
+function findpeople_widget()
+{
        $a = get_app();
        $global_dir = Config::get('system', 'directory');
 
@@ -31,8 +32,8 @@ function findpeople_widget() {
                $x = PConfig::get(local_user(), 'system', 'invites_remaining');
                if ($x || is_site_admin()) {
                        $a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
-                       . sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
-                       . '</div>' . $inv;
+                               . tt('%d invitation available', '%d invitations available', $x)
+                               . '</div>' . $inv;
                }
        }
 
@@ -49,12 +50,10 @@ function findpeople_widget() {
                '$directory' => t('View Global Directory'),
                '$global_dir' => $global_dir
        ));
-
 }
 
-function unavailable_networks() {
-       $network_filter = "";
-
+function unavailable_networks()
+{
        $networks = array();
 
        if (!plugin_enabled("appnet")) {
@@ -100,10 +99,8 @@ function unavailable_networks() {
        return $network_filter;
 }
 
-function networks_widget($baseurl, $selected = '') {
-
-       $a = get_app();
-
+function networks_widget($baseurl, $selected = '')
+{
        if (!local_user()) {
                return '';
        }
@@ -138,21 +135,21 @@ function networks_widget($baseurl, $selected = '') {
                '$all' => t('All Networks'),
                '$nets' => $nets,
                '$base' => $baseurl,
-
        ));
 }
 
-function fileas_widget($baseurl, $selected = '') {
-       if (! local_user()) {
+function fileas_widget($baseurl, $selected = '')
+{
+       if (!local_user()) {
                return '';
        }
 
-       if (! Feature::isEnabled(local_user(), 'filing')) {
+       if (!Feature::isEnabled(local_user(), 'filing')) {
                return '';
        }
 
        $saved = PConfig::get(local_user(), 'system', 'filetags');
-       if (! strlen($saved)) {
+       if (!strlen($saved)) {
                return;
        }
 
@@ -173,20 +170,19 @@ function fileas_widget($baseurl, $selected = '') {
                '$all' => t('Everything'),
                '$terms' => $terms,
                '$base' => $baseurl,
-
        ));
 }
 
-function categories_widget($baseurl, $selected = '') {
-
+function categories_widget($baseurl, $selected = '')
+{
        $a = get_app();
 
-       if (! Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
+       if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
                return '';
        }
 
        $saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
-       if (! strlen($saved)) {
+       if (!strlen($saved)) {
                return;
        }
 
@@ -208,14 +204,11 @@ function categories_widget($baseurl, $selected = '') {
                '$all' => t('Everything'),
                '$terms' => $terms,
                '$base' => $baseurl,
-
        ));
 }
 
-function common_friends_visitor_widget($profile_uid) {
-
-       $a = get_app();
-
+function common_friends_visitor_widget($profile_uid)
+{
        if (local_user() == $profile_uid) {
                return;
        }
@@ -231,7 +224,7 @@ function common_friends_visitor_widget($profile_uid) {
                }
        }
 
-       if (! $cid) {
+       if (!$cid) {
                if (get_my_url()) {
                        $r = dba::select('contact', array('id'),
                                        array('nurl' => normalise_link(get_my_url()), 'uid' => $profile_uid), array('limit' => 1));
@@ -239,8 +232,9 @@ function common_friends_visitor_widget($profile_uid) {
                                $cid = $r['id'];
                        } else {
                                $r = dba::select('gcontact', array('id'), array('nurl' => normalise_link(get_my_url())), array('limit' => 1));
-                               if (DBM::is_result($r))
+                               if (DBM::is_result($r)) {
                                        $zcid = $r['id'];
+                               }
                        }
                }
        }
@@ -254,7 +248,8 @@ function common_friends_visitor_widget($profile_uid) {
        } else {
                $t = GContact::countCommonFriendsZcid($profile_uid, $zcid);
        }
-       if (! $t) {
+
+       if (!$t) {
                return;
        }
 
@@ -265,7 +260,7 @@ function common_friends_visitor_widget($profile_uid) {
        }
 
        return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
-               '$desc' =>  sprintf(tt("%d contact in common", "%d contacts in common", $t), $t),
+               '$desc' => tt("%d contact in common", "%d contacts in common", $t),
                '$base' => System::baseUrl(),
                '$uid' => $profile_uid,
                '$cid' => (($cid) ? $cid : '0'),
index 958d507d78d979223c71c9c773ebbf73c15d3154..020eca18418ffaf8cda8f0110f4b793044e2fa3b 100644 (file)
@@ -490,7 +490,6 @@ function item_condition() {
  *
  */
 function conversation(App $a, $items, $mode, $update, $preview = false) {
-
        require_once 'include/bbcode.php';
        require_once 'mod/proxy.php';
 
@@ -575,10 +574,14 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                . " var profile_page = 1; </script>";
                }
        } elseif ($mode === 'community') {
+               if (!$community_readonly) {
+                       $items = community_add_items($items);
+               }
                $profile_owner = 0;
                if (!$update) {
                        $live_update_div = '<div id="live-community"></div>' . "\r\n"
-                               . "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+                               . "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 10)
+                               ."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
                }
        } elseif ($mode === 'search') {
                $live_update_div = '<div id="live-search"></div>' . "\r\n";
@@ -586,11 +589,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 
        $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
 
-
-       if ($update) {
-               $return_url = $_SESSION['return_url'];
-       } else {
-               $return_url = $_SESSION['return_url'] = $a->query_string;
+       if (!$update) {
+               $_SESSION['return_url'] = $a->query_string;
        }
 
        $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview);
@@ -598,9 +598,6 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 
        $items = $cb['items'];
 
-       $cmnt_tpl    = get_markup_template('comment_item.tpl');
-       $hide_comments_tpl = get_markup_template('hide_comments.tpl');
-
        $conv_responses = array(
                'like' => array('title' => t('Likes','title')), 'dislike' => array('title' => t('Dislikes','title')),
                'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
@@ -613,14 +610,25 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
        $page_template = get_markup_template("conversation.tpl");
 
        if ($items && count($items)) {
+               $community_readonly = ($mode === 'community');
+
                // Currently behind a config value. This allows the commenting and sharing of every public item.
-               if (Config::get('system', 'comment_public') && local_user()) {
-                       $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA));
+               if (Config::get('system', 'comment_public')) {
+                       if ($mode === 'community') {
+                               $community_readonly = false;
+                               $writable = true;
+                       } else {
+                               $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN));
+                       }
                } else {
                        $writable = false;
                }
 
-               if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
+               if (!local_user()) {
+                       $writable = false;
+               }
+
+               if ($mode === 'network-new' || $mode === 'search' || $community_readonly) {
 
                        /*
                         * "New Item View" on network page or search page results
@@ -745,7 +753,6 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 
                                $lock = false;
                                $likebuttons = false;
-                               $shareable = false;
 
                                $body = prepare_body($item, true, $preview);
 
@@ -830,9 +837,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                         * this shouldn't be needed, as we should have only them in our array
                         * But for now, this array respects the old style, just in case
                         */
-                       $threads = array();
                        foreach ($items as $item) {
-
                                if ($arr_blocked) {
                                        $blocked = false;
                                        foreach ($arr_blocked as $b) {
@@ -869,7 +874,6 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                        }
 
                        $threads = $conv->getTemplateData($conv_responses);
-
                        if (!$threads) {
                                logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
                                $threads = array();
@@ -891,6 +895,70 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
        return $o;
 }
 
+/**
+ * @brief Add comments to top level entries that had been fetched before
+ *
+ * The system will fetch the comments for the local user whenever possible.
+ * This behaviour is currently needed to allow commenting on Friendica posts.
+ *
+ * @param array $parents Parent items
+ *
+ * @return array items with parents and comments
+ */
+function community_add_items($parents) {
+       $max_comments = Config::get("system", "max_comments", 100);
+
+       $items = array();
+
+       foreach ($parents AS $parent) {
+               $thread_items = dba::p(item_query()." AND `item`.`uid` = ?
+                       AND `item`.`parent-uri` = ?
+                       ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+                       local_user(),
+                       $parent['uri']
+               );
+               $comments = dba::inArray($thread_items);
+
+               // Check if the original item is in the result.
+               // When commenting from the community page there can be incomplete threads
+               if (count($comments) > 0) {
+                       $parent_found = false;
+                       foreach ($comments as $comment) {
+                               if ($comment['uri'] == $comment['parent-uri']) {
+                                       $parent_found = true;
+                                       break;
+                               }
+                       }
+                       if (!$parent_found) {
+                               $comments = array();
+                       }
+               }
+
+               if (count($comments) == 0) {
+                       $thread_items = dba::p(item_query()." AND `item`.`uid` = 0
+                               AND `item`.`parent-uri` = ?
+                               ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+                               $parent['uri']
+                       );
+                       $comments = dba::inArray($thread_items);
+               }
+
+               if (count($comments) != 0) {
+                       $items = array_merge($items, $comments);
+               }
+       }
+
+       foreach ($items as $index => $item) {
+               if ($item['uid'] == 0) {
+                       $items[$index]['writable'] = in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+               }
+       }
+
+       $items = conv_sort($items, "`commented`");
+
+       return $items;
+}
+
 function best_link_url($item, &$sparkle, $url = '') {
 
        $best_url = '';
@@ -937,7 +1005,6 @@ function item_photo_menu($item) {
        $status_link = '';
        $photos_link = '';
        $posts_link = '';
-       $network = '';
 
        if ((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] && (! $item['self'])) {
                $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
@@ -963,7 +1030,6 @@ function item_photo_menu($item) {
                $status_link = $profile_link . '?url=status';
                $photos_link = $profile_link . '?url=photos';
                $profile_link = $profile_link . '?url=profile';
-               $zurl = '';
        } else {
                $profile_link = zrl($profile_link);
        }
@@ -1050,7 +1116,6 @@ function builtin_activity_puller($item, &$conv_responses) {
                                break;
                        default:
                                return;
-                               break;
                }
 
                if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
@@ -1298,7 +1363,6 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 
                // ACL permissions box
                '$acl'           => $x['acl'],
-               '$acl_data'      => $x['acl_data'],
                '$group_perms'   => t('Post to Groups'),
                '$contact_perms' => t('Post to Contacts'),
                '$private'       => t('Private post'),
@@ -1593,22 +1657,25 @@ function get_responses($conv_responses, $response_verbs, $ob, $item) {
        return $ret;
 }
 
-function get_response_button_text($v, $count) {
+function get_response_button_text($v, $count)
+{
        switch ($v) {
                case 'like':
-                       return tt('Like', 'Likes', $count, 'noun');
+                       $return = tt('Like', 'Likes', $count);
                        break;
                case 'dislike':
-                       return tt('Dislike', 'Dislikes', $count, 'noun');
+                       $return = tt('Dislike', 'Dislikes', $count);
                        break;
                case 'attendyes':
-                       return tt('Attending', 'Attending', $count, 'noun');
+                       $return = tt('Attending', 'Attending', $count);
                        break;
                case 'attendno':
-                       return tt('Not Attending', 'Not Attending', $count, 'noun');
+                       $return = tt('Not Attending', 'Not Attending', $count);
                        break;
                case 'attendmaybe':
-                       return tt('Undecided', 'Undecided', $count, 'noun');
+                       $return = tt('Undecided', 'Undecided', $count);
                        break;
        }
+
+       return $return;
 }
index cb27799798b0c3c5a269eae3e8df8b882bd45125..26f1debecf443b00a8c42d07c8ef797d60cb8da3 100644 (file)
@@ -177,13 +177,10 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  * @param string $dob Date of Birth
  * @return string Formatted html
  */
-function dob($dob) {
-       list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
+function dob($dob)
+{
+       list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d');
 
-       $f = Config::get('system', 'birthday_input_format');
-       if (! $f) {
-               $f = 'ymd';
-       }
        if ($dob <= '0001-01-01') {
                $value = '';
        } else {
@@ -215,8 +212,6 @@ function dob($dob) {
 /**
  * @brief Returns a date selector
  *
- * @param string $format
- *  Format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param string $min
  *  Unix timestamp of minimum date
  * @param string $max
@@ -228,15 +223,14 @@ function dob($dob) {
  *
  * @return string Parsed HTML output.
  */
-function datesel($format, $min, $max, $default, $id = 'datepicker') {
-       return datetimesel($format, $min, $max, $default, '', $id, true, false, '', '');
+function datesel($min, $max, $default, $id = 'datepicker')
+{
+       return datetimesel($min, $max, $default, '', $id, true, false, '', '');
 }
 
 /**
  * @brief Returns a time selector
  *
- * @param string $format
- *  Format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param $h
  *  Already selected hour
  * @param $m
@@ -246,15 +240,14 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') {
  *
  * @return string Parsed HTML output.
  */
-function timesel($format, $h, $m, $id = 'timepicker') {
-       return datetimesel($format, new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
+function timesel($h, $m, $id = 'timepicker')
+{
+       return datetimesel(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
 }
 
 /**
  * @brief Returns a datetime selector.
  *
- * @param string $format
- *  format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param string $min
  *  unix timestamp of minimum date
  * @param string $max
@@ -278,8 +271,8 @@ function timesel($format, $h, $m, $id = 'timepicker') {
  * @todo Once browser support is better this could probably be replaced with
  * native HTML5 date picker.
  */
-function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) {
-
+function datetimesel($min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false)
+{
        // First day of the week (0 = Sunday)
        $firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
 
@@ -619,7 +612,7 @@ function update_contact_birthdays() {
                        $bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
                        $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
 
-                       $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
+                       q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
                                VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",
                                intval($rr['uid']),
                                intval($rr['id']),
index 99d5ea0ab3939504f7458cac9a919efe46e613a3..58f40fe2dd7ad934b82ebf3c9d81bc48018ccf19 100644 (file)
@@ -20,12 +20,11 @@ require_once 'include/html2bbcode.php';
                        source_link, activity, preamble, notify_flags,
                        language, show_in_notification_page
  */
-function notification($params) {
-
+function notification($params)
+{
        $a = get_app();
 
        // from here on everything is in the recipients language
-
        push_lang($params['language']);
 
        $banner = t('Friendica Notification');
@@ -33,21 +32,22 @@ function notification($params) {
        $siteurl = System::baseUrl(true);
        $thanks = t('Thank You,');
        $sitename = $a->config['sitename'];
-       if (!x($a->config['admin_name']))
+       if (!x($a->config['admin_name'])) {
            $site_admin = sprintf(t('%s Administrator'), $sitename);
-       else
+       } else {
            $site_admin = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
-
-       $nickname = "";
+       }
 
        $sender_name = $sitename;
        $hostname = $a->get_hostname();
-       if (strpos($hostname, ':'))
+       if (strpos($hostname, ':')) {
                $hostname = substr($hostname, 0, strpos($hostname, ':'));
+       }
 
        $sender_email = $a->config['sender_email'];
-       if (empty($sender_email))
+       if (empty($sender_email)) {
                $sender_email = t('noreply').'@'.$hostname;
+       }
 
        if ($params['type'] != SYSTEM_EMAIL) {
                $user = dba::select('user', array('nickname', 'page-flags'),
@@ -77,21 +77,21 @@ function notification($params) {
        if (array_key_exists('item', $params)) {
                $title = $params['item']['title'];
                $body = $params['item']['body'];
-       } else
+       } else {
                $title = $body = '';
+       }
 
-       // e.g. "your post", "David's photo", etc.
-       $possess_desc = t('%s <!item_type!>');
-
-       if (isset($params['item']['id']))
+       if (isset($params['item']['id'])) {
                $item_id = $params['item']['id'];
-       else
+       } else {
                $item_id = 0;
+       }
 
-       if (isset($params['parent']))
+       if (isset($params['parent'])) {
                $parent_id = $params['parent'];
-       else
+       } else {
                $parent_id = 0;
+       }
 
        if ($params['type'] == NOTIFY_MAIL) {
                $subject = sprintf(t('[Friendica:Notify] New mail received at %s'), $sitename);
@@ -117,8 +117,6 @@ function notification($params) {
 
                // Check to see if there was already a tag notify or comment notify for this post.
                // If so don't create a second notification
-
-               $p = null;
                $p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d, %d) AND `link` = '%s' AND `uid` = %d LIMIT 1",
                        intval(NOTIFY_TAGSELF),
                        intval(NOTIFY_COMMENT),
@@ -151,19 +149,21 @@ function notification($params) {
                                                                $item_post_type);
 
                // "George Bull's post"
-               if ($p)
+               if ($p) {
                        $dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'),
                                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
                                                $itemlink,
                                                $p[0]['author-name'],
                                                $item_post_type);
+               }
 
                // "your post"
-               if ($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall'])
+               if ($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall']) {
                        $dest_str = sprintf(t('%1$s commented on [url=%2$s]your %3$s[/url]'),
                                                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
                                                                $itemlink,
                                                                $item_post_type);
+               }
 
                // Some mail softwares relies on subject field for threading.
                // So, we cannot have different subjects for notifications of the same thread.
@@ -413,7 +413,6 @@ function notification($params) {
 
        $body      = $h['body'];
 
-       $sitelink  = $h['sitelink'];
        $tsitelink = $h['tsitelink'];
        $hsitelink = $h['hsitelink'];
        $itemlink  = $h['itemlink'];
@@ -455,8 +454,7 @@ function notification($params) {
                }
 
                // create notification entry in DB
-
-               $r = q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`, `name_cache`)
+               q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`, `name_cache`)
                        values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s')",
                        dbesc($datarray['hash']),
                        dbesc($datarray['name']),
@@ -477,17 +475,15 @@ function notification($params) {
                        dbesc($hash),
                        intval($params['uid'])
                );
-               if ($r)
+               if ($r) {
                        $notify_id = $r[0]['id'];
-               else {
+               else {
                        pop_lang();
                        return False;
                }
 
                // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums
                // After we've stored everything, look again to see if there are any duplicates and if so remove them
-
-               $p = null;
                $p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d) AND `link` = '%s' AND `uid` = %d ORDER BY `id`",
                        intval(NOTIFY_TAGSELF),
                        intval(NOTIFY_COMMENT),
@@ -500,18 +496,16 @@ function notification($params) {
                        }
 
                        // only continue on if we stored the first one
-
                        if ($notify_id != $p[0]['id']) {
                                pop_lang();
                                return False;
                        }
                }
 
-
                $itemlink = System::baseUrl().'/notify/view/'.$notify_id;
                $msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
                $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
-               $r = q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
+               q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
                        dbesc($msg),
                        dbesc($msg_cache),
                        intval($notify_id),
@@ -539,7 +533,7 @@ function notification($params) {
 
                        if (!$r) {
                                logger("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG);
-                               $r = q("INSERT INTO `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
+                               q("INSERT INTO `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
                                        values(%d, %d, %d, %d)",
                                        intval($notify_id),
                                        intval($params['parent']),
@@ -637,7 +631,6 @@ function notification($params) {
                ));
 
                // use the Emailer class to send the message
-
                return Emailer::send(
                        array(
                        'uid' => $params['uid'],
index 584a7076768337537f7f548921e0b6b1cf0f06d2..d1359512a35a92e967de6c7cad4a353fa44099d0 100644 (file)
@@ -261,13 +261,10 @@ function event_store($arr) {
                $contact = $c[0];
        }
 
-
        // Existing event being modified.
-
        if ($arr['id']) {
 
                // has the event actually changed?
-
                $r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($arr['id']),
                        intval($arr['uid'])
@@ -275,7 +272,6 @@ function event_store($arr) {
                if ((! DBM::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
 
                        // Nothing has changed. Grab the item id to return.
-
                        $r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
                                intval($arr['id']),
                                intval($arr['uid'])
@@ -284,8 +280,7 @@ function event_store($arr) {
                }
 
                // The event changed. Update it.
-
-               $r = q("UPDATE `event` SET
+               q("UPDATE `event` SET
                        `edited` = '%s',
                        `start` = '%s',
                        `finish` = '%s',
@@ -309,6 +304,7 @@ function event_store($arr) {
                        intval($arr['id']),
                        intval($arr['uid'])
                );
+
                $r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
                        intval($arr['id']),
                        intval($arr['uid'])
@@ -336,8 +332,7 @@ function event_store($arr) {
                return $item_id;
        } else {
                // New event. Store it.
-
-               $r = q("INSERT INTO `event` (`uid`,`cid`,`guid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
+               q("INSERT INTO `event` (`uid`,`cid`,`guid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`,
                        `adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
                        VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
                        intval($arr['uid']),
@@ -403,21 +398,7 @@ function event_store($arr) {
                $item_arr['object'] .= '</object>' . "\n";
 
                $item_id = item_store($item_arr);
-
-               $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-                       intval($arr['uid'])
-               );
-               //if (DBM::is_result($r))
-               //      $plink = System::baseUrl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
-
-
                if ($item_id) {
-                       //q("UPDATE `item` SET `plink` = '%s', `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
-                       //      dbesc($plink),
-                       //      intval($event['id']),
-                       //      intval($arr['uid']),
-                       //      intval($item_id)
-                       //);
                        q("UPDATE `item` SET `event-id` = %d  WHERE `uid` = %d AND `id` = %d",
                                intval($event['id']),
                                intval($arr['uid']),
@@ -675,9 +656,12 @@ function process_events($arr) {
  * @param string $timezone The timezone of the user (not implemented yet).
  *
  * @return string Content according to selected export format.
+ *
+ * @todo Implement timezone support
  */
-function event_format_export ($events, $format = 'ical', $timezone) {
-       if (! ((is_array($events)) && count($events))) {
+function event_format_export($events, $format = 'ical', $timezone)
+{
+       if (!((is_array($events)) && count($events))) {
                return;
        }
 
index 0ac0078c859272b99f0db46b26d8c04866cd9193..64fe6a31093878ee04245301fbf0b4f8cfdb352d 100644 (file)
@@ -1,11 +1,11 @@
 <?php
-function create_files_from_item($itemid) {
-       $a = get_app();
 
+function create_files_from_item($itemid)
+{
        $messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `file`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
-
-       if (!$messages)
+       if (!$messages) {
                return;
+       }
 
        $message = $messages[0];
 
@@ -19,18 +19,23 @@ function create_files_from_item($itemid) {
        if ($message["deleted"])
                return;
 
-       if (preg_match_all("/\[(.*?)\]/ism", $message["file"], $files))
-               foreach ($files[1] as $file)
-                       $r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`) VALUES (%d, %d, %d, %d, '%s')",
+       if (preg_match_all("/\[(.*?)\]/ism", $message["file"], $files)) {
+               foreach ($files[1] as $file) {
+                       q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`) VALUES (%d, %d, %d, %d, '%s')",
                                intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_FILE), dbesc($file));
+               }
+       }
 
-       if (preg_match_all("/\<(.*?)\>/ism", $message["file"], $files))
-               foreach ($files[1] as $file)
-                       $r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`) VALUES (%d, %d, %d, %d, '%s')",
+       if (preg_match_all("/\<(.*?)\>/ism", $message["file"], $files)) {
+               foreach ($files[1] as $file) {
+                       q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`) VALUES (%d, %d, %d, %d, '%s')",
                                intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), dbesc($file));
+               }
+       }
 }
 
-function create_files_from_itemuri($itemuri, $uid) {
+function create_files_from_itemuri($itemuri, $uid)
+{
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
        if (count($messages)) {
@@ -39,11 +44,12 @@ function create_files_from_itemuri($itemuri, $uid) {
        }
 }
 
-function update_files_for_items() {
+function update_files_for_items()
+{
        $messages = q("SELECT `id` FROM `item` where file !=''");
 
        foreach ($messages as $message) {
-               echo $message["id"]."\n";
+               echo $message["id"] . "\n";
                create_files_from_item($message["id"]);
        }
 }
index c9e81f7b37a169e54b4fd6deea5151af15fd38fd..9aedafb64d6287d2e154a2ccdfb8f27097bff001 100644 (file)
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file include/follow.php
  */
@@ -16,21 +17,24 @@ use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 
-function update_contact($id) {
+function update_contact($id)
+{
        /*
-       Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
-       This will reliably kill your communication with Friendica contacts.
-       */
+         Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
+         This will reliably kill your communication with Friendica contacts.
+        */
 
        $r = q("SELECT `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `network` FROM `contact` WHERE `id` = %d", intval($id));
-       if (!$r)
+       if (!$r) {
                return false;
+       }
 
        $ret = Probe::uri($r[0]["url"]);
 
        // If Probe::uri fails the network code will be different
-       if ($ret["network"] != $r[0]["network"])
+       if ($ret["network"] != $r[0]["network"]) {
                return false;
+       }
 
        $update = false;
 
@@ -43,8 +47,9 @@ function update_contact($id) {
                        $update = true;
        }
 
-       if (!$update)
+       if (!$update) {
                return true;
+       }
 
        q("UPDATE `contact` SET `url` = '%s', `nurl` = '%s', `addr` = '%s', `alias` = '%s', `batch` = '%s', `notify` = '%s', `poll` = '%s', `poco` = '%s' WHERE `id` = %d",
                dbesc($ret['url']),
@@ -64,29 +69,34 @@ function update_contact($id) {
        return true;
 }
 
-//
-// Takes a $uid and a url/handle and adds a new contact
-// Currently if the contact is DFRN, interactive needs to be true, to redirect to the
-// dfrn_request page.
-
-// Otherwise this can be used to bulk add statusnet contacts, twitter contacts, etc.
-// Returns an array
-//  $return['success'] boolean true if successful
-//  $return['message'] error text if success is false.
-
-
-
-function new_contact($uid, $url, $interactive = false, $network = '') {
-
-       $result = array('cid' => -1, 'success' => false,'message' => '');
+/**
+ * Takes a $uid and a url/handle and adds a new contact
+ * Currently if the contact is DFRN, interactive needs to be true, to redirect to the
+ * dfrn_request page.
+ *
+ * Otherwise this can be used to bulk add statusnet contacts, twitter contacts, etc.
+ *
+ * Returns an array
+ * $return['success'] boolean true if successful
+ * $return['message'] error text if success is false.
+ *
+ * @brief Takes a $uid and a url/handle and adds a new contact
+ * @param int    $uid
+ * @param string $url
+ * @param bool   $interactive
+ * @param string $network
+ * @return boolean|string
+ */
+function new_contact($uid, $url, $interactive = false, $network = '')
+{
+       $result = array('cid' => -1, 'success' => false, 'message' => '');
 
        $a = get_app();
 
        // remove ajax junk, e.g. Twitter
+       $url = str_replace('/#!/', '/', $url);
 
-       $url = str_replace('/#!/','/',$url);
-
-       if (! allowed_url($url)) {
+       if (!allowed_url($url)) {
                $result['message'] = t('Disallowed profile URL.');
                return $result;
        }
@@ -96,7 +106,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
                return $result;
        }
 
-       if (! $url) {
+       if (!$url) {
                $result['message'] = t('Connect URL missing.');
                return $result;
        }
@@ -105,14 +115,14 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 
        call_hooks('follow', $arr);
 
-       if (x($arr['contact'],'name')) {
+       if (x($arr['contact'], 'name')) {
                $ret = $arr['contact'];
        } else {
                $ret = Probe::uri($url, $network, $uid, false);
        }
 
        if (($network != '') && ($ret['network'] != $network)) {
-               logger('Expected network '.$network.' does not match actual network '.$ret['network']);
+               logger('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
                return result;
        }
 
@@ -128,7 +138,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 
                        // NOTREACHED
                }
-       } elseif (Config::get('system','dfrn_only')) {
+       } elseif (Config::get('system', 'dfrn_only')) {
                $result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
                $result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
                return $result;
@@ -136,36 +146,36 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 
        // This extra param just confuses things, remove it
        if ($ret['network'] === NETWORK_DIASPORA) {
-               $ret['url'] = str_replace('?absolute=true','',$ret['url']);
+               $ret['url'] = str_replace('?absolute=true', '', $ret['url']);
        }
 
        // do we have enough information?
 
-       if (! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
-               $result['message'] .=  t('The profile address specified does not provide adequate information.') . EOL;
-               if (! x($ret,'poll')) {
+       if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) {
+               $result['message'] .= t('The profile address specified does not provide adequate information.') . EOL;
+               if (!x($ret, 'poll')) {
                        $result['message'] .= t('No compatible communication protocols or feeds were discovered.') . EOL;
                }
-               if (! x($ret,'name')) {
-                       $result['message'] .=  t('An author or name was not found.') . EOL;
+               if (!x($ret, 'name')) {
+                       $result['message'] .= t('An author or name was not found.') . EOL;
                }
-               if (! x($ret,'url')) {
-                       $result['message'] .=  t('No browser URL could be matched to this address.') . EOL;
+               if (!x($ret, 'url')) {
+                       $result['message'] .= t('No browser URL could be matched to this address.') . EOL;
                }
-               if (strpos($url,'@') !== false) {
-                       $result['message'] .=  t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
-                       $result['message'] .=  t('Use mailto: in front of address to force email check.') . EOL;
+               if (strpos($url, '@') !== false) {
+                       $result['message'] .= t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
+                       $result['message'] .= t('Use mailto: in front of address to force email check.') . EOL;
                }
                return $result;
        }
 
-       if ($ret['network'] === NETWORK_OSTATUS && Config::get('system','ostatus_disabled')) {
+       if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
                $result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
                $ret['notify'] = '';
        }
 
-       if (! $ret['notify']) {
-               $result['message'] .=  t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
+       if (!$ret['notify']) {
+               $result['message'] .= t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
        }
 
        $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
@@ -189,10 +199,11 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
                dbesc($ret['network'])
        );
 
-       if (!DBM::is_result($r))
+       if (!DBM::is_result($r)) {
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
                        intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
-       );
+               );
+       }
 
        if (DBM::is_result($r)) {
                // update contact
@@ -204,7 +215,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
                $new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
                // create contact record
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `network`, `pubkey`, `rel`, `priority`,
+               q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `network`, `pubkey`, `rel`, `priority`,
                        `writable`, `hidden`, `blocked`, `readonly`, `pending`, `subhub` )
                        VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0, %d ) ",
                        intval($uid),
@@ -235,13 +246,13 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
                intval($uid)
        );
 
-       if (! DBM::is_result($r)) {
-               $result['message'] .=  t('Unable to retrieve contact information.') . EOL;
+       if (!DBM::is_result($r)) {
+               $result['message'] .= t('Unable to retrieve contact information.') . EOL;
                return $result;
        }
 
        $contact = $r[0];
-       $contact_id  = $r[0]['id'];
+       $contact_id = $r[0]['id'];
        $result['cid'] = $contact_id;
 
        Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
@@ -270,7 +281,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 
                if ($contact['network'] == NETWORK_DIASPORA) {
                        $ret = Diaspora::sendShare($a->user, $contact);
-                       logger('share returns: '.$ret);
+                       logger('share returns: ' . $ret);
                }
        }
 
index 72185de3b5c9bea9eaf1c53f8371c23ba87f0aba..83aa05ed565691029e463b6d7160156849e4a1ef 100644 (file)
@@ -1,15 +1,14 @@
 <?php
-require_once("include/html2bbcode.php");
+
+require_once 'include/html2bbcode.php';
 
 function breaklines($line, $level, $wraplength = 75)
 {
-
-       if ($wraplength == 0)
+       if ($wraplength == 0) {
                $wraplength = 2000000;
+       }
 
-       //      return($line);
-
-       $wraplen = $wraplength-$level;
+       $wraplen = $wraplength - $level;
 
        $newlines = array();
 
@@ -20,27 +19,28 @@ function breaklines($line, $level, $wraplength = 75)
 
                $pos = strrpos($subline, ' ');
 
-               if ($pos == 0)
+               if ($pos == 0) {
                        $pos = strpos($line, ' ');
+               }
 
                if (($pos > 0) && strlen($line) > $wraplen) {
                        $newline = trim(substr($line, 0, $pos));
-                       if ($level > 0)
-                               $newline = str_repeat(">", $level).' '.$newline;
+                       if ($level > 0) {
+                               $newline = str_repeat(">", $level) . ' ' . $newline;
+                       }
 
-                       $newlines[] = $newline." ";
-                       $line = substr($line, $pos+1);
+                       $newlines[] = $newline . " ";
+                       $line = substr($line, $pos + 1);
                }
-
        } while ((strlen($line) > $wraplen) && !($oldline == $line));
 
-       if ($level > 0)
-               $line = str_repeat(">", $level).' '.$line;
+       if ($level > 0) {
+               $line = str_repeat(">", $level) . ' ' . $line;
+       }
 
        $newlines[] = $line;
 
-
-       return(implode($newlines, "\n"));
+       return implode($newlines, "\n");
 }
 
 function quotelevel($message, $wraplength = 75)
@@ -49,62 +49,72 @@ function quotelevel($message, $wraplength = 75)
 
        $newlines = array();
        $level = 0;
-       foreach ($lines as $line) {;
+       foreach ($lines as $line) {
                $line = trim($line);
                $startquote = false;
-               while (strpos("*".$line, '[quote]') > 0) {
+               while (strpos("*" . $line, '[quote]') > 0) {
                        $level++;
                        $pos = strpos($line, '[quote]');
-                       $line = substr($line, 0, $pos).substr($line, $pos+7);
+                       $line = substr($line, 0, $pos) . substr($line, $pos + 7);
                        $startquote = true;
                }
 
                $currlevel = $level;
 
-               while (strpos("*".$line, '[/quote]') > 0) {
+               while (strpos("*" . $line, '[/quote]') > 0) {
                        $level--;
-                       if ($level < 0)
+                       if ($level < 0) {
                                $level = 0;
+                       }
 
                        $pos = strpos($line, '[/quote]');
-                       $line = substr($line, 0, $pos).substr($line, $pos+8);
+                       $line = substr($line, 0, $pos) . substr($line, $pos + 8);
                }
 
-               if (!$startquote || ($line != ''))
+               if (!$startquote || ($line != '')) {
                        $newlines[] = breaklines($line, $currlevel, $wraplength);
+               }
        }
-       return(implode($newlines, "\n"));
+
+       return implode($newlines, "\n");
 }
 
-function collecturls($message) {
+function collecturls($message)
+{
        $pattern = '/<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
        preg_match_all($pattern, $message, $result, PREG_SET_ORDER);
 
        $urls = array();
        foreach ($result as $treffer) {
-
                $ignore = false;
 
                // A list of some links that should be ignored
                $list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
-                               "//facebook.com/profile.php?id=", "//plus.google.com/", "//twitter.com/");
-               foreach ($list as $listitem)
-                       if (strpos($treffer[1], $listitem) !== false)
+                       "//facebook.com/profile.php?id=", "//plus.google.com/", "//twitter.com/");
+               foreach ($list as $listitem) {
+                       if (strpos($treffer[1], $listitem) !== false) {
                                $ignore = true;
+                       }
+               }
 
-               if ((strpos($treffer[1], "//twitter.com/") !== false) && (strpos($treffer[1], "/status/") !== false))
-                               $ignore = false;
+               if ((strpos($treffer[1], "//twitter.com/") !== false) && (strpos($treffer[1], "/status/") !== false)) {
+                       $ignore = false;
+               }
 
-               if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/posts") !== false))
-                               $ignore = false;
+               if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/posts") !== false)) {
+                       $ignore = false;
+               }
 
-               if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/photos") !== false))
-                               $ignore = false;
+               if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/photos") !== false)) {
+                       $ignore = false;
+               }
 
-               if (!$ignore)
+               if (!$ignore) {
                        $urls[$treffer[1]] = $treffer[1];
+               }
        }
-       return($urls);
+
+       return $urls;
 }
 
 function html2plain($html, $wraplength = 75, $compact = false)
@@ -140,20 +150,21 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
        // MyBB-Auszeichnungen
        /*
-       node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '_', '_');
-       node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '/', '/');
-       node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '*', '*');
+         node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '_', '_');
+         node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '/', '/');
+         node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '*', '*');
 
-       node2bbcode($doc, 'strong', array(), '*', '*');
-       node2bbcode($doc, 'b', array(), '*', '*');
-       node2bbcode($doc, 'i', array(), '/', '/');
-       node2bbcode($doc, 'u', array(), '_', '_');
-       */
+         node2bbcode($doc, 'strong', array(), '*', '*');
+         node2bbcode($doc, 'b', array(), '*', '*');
+         node2bbcode($doc, 'i', array(), '/', '/');
+         node2bbcode($doc, 'u', array(), '_', '_');
+        */
 
-       if ($compact)
+       if ($compact) {
                node2bbcode($doc, 'blockquote', array(), "»", "«");
-       else
+       } else {
                node2bbcode($doc, 'blockquote', array(), '[quote]', "[/quote]\n");
+       }
 
        node2bbcode($doc, 'br', array(), "\n", '');
 
@@ -166,7 +177,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
        //node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n");
        node2bbcode($doc, 'li', array(), "\n* ", "\n");
 
-       node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", "");
+       node2bbcode($doc, 'hr', array(), "\n" . str_repeat("-", 70) . "\n", "");
 
        node2bbcode($doc, 'tr', array(), "\n", "");
        node2bbcode($doc, 'td', array(), "\t", "");
@@ -184,12 +195,13 @@ function html2plain($html, $wraplength = 75, $compact = false)
        //node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', '');
        //node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', '');
        //node2bbcode($doc, 'img', array(), '', '');
-       if (!$compact)
-               node2bbcode($doc, 'img', array('src'=>'/(.+)/'), ' [img]$1', '[/img] ');
-       else
-               node2bbcode($doc, 'img', array('src'=>'/(.+)/'), ' ', ' ');
+       if (!$compact) {
+               node2bbcode($doc, 'img', array('src' => '/(.+)/'), ' [img]$1', '[/img] ');
+       } else {
+               node2bbcode($doc, 'img', array('src' => '/(.+)/'), ' ', ' ');
+       }
 
-       node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), ' $1 ', '', true);
+       node2bbcode($doc, 'iframe', array('src' => '/(.+)/'), ' $1 ', '');
 
        $message = $doc->saveHTML();
 
@@ -200,7 +212,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
        // was ersetze ich da?
        // Irgendein stoerrisches UTF-Zeug
-       $message = str_replace(chr(194).chr(160), ' ', $message);
+       $message = str_replace(chr(194) . chr(160), ' ', $message);
 
        $message = str_replace("&nbsp;", " ", $message);
 
@@ -212,13 +224,12 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
        $message = html_entity_decode($message, ENT_QUOTES, 'UTF-8');
 
-       if (!$compact && ($message != "")) {
-               $counter = 1;
-               foreach ($urls as $id=>$url)
-                       if ($url != "")
-                               if (strpos($message, $url) === false)
-                                       $message .= "\n".$url." ";
-                                       //$message .= "\n[".($counter++)."] ".$url;
+       if (!$compact && ($message != '')) {
+               foreach ($urls as $id => $url) {
+                       if ($url != '' && strpos($message, $url) === false) {
+                               $message .= "\n" . $url . ' ';
+                       }
+               }
        }
 
        $message = str_replace("\n«", "«\n", $message);
@@ -231,5 +242,5 @@ function html2plain($html, $wraplength = 75, $compact = false)
 
        $message = quotelevel(trim($message), $wraplength);
 
-       return(trim($message));
+       return trim($message);
 }
index 0ad0e646dc7d34ceb35d1413df9144e404abfe90..6c9627a1db48167d910fb07fe7bd64063f0bca72 100644 (file)
@@ -230,7 +230,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true)
 
        $o = '';
        $location = false;
-       $address = false;
 
        // This function can also use contact information in $profile
        $is_contact = x($profile, 'cid');
@@ -381,7 +380,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true)
        $xmpp     = x($profile, 'xmpp')     ? t('XMPP:')     : false;
 
        if ((x($profile, 'hidewall') || $block) && !local_user() && !remote_user()) {
-               $location = $pdesc = $gender = $marital = $homepage = $about = false;
+               $location = $gender = $marital = $homepage = $about = false;
        }
 
        $split_name = Diaspora::splitName($profile['name']);
@@ -551,10 +550,8 @@ function get_birthdays()
                                $cids[] = $rr['cid'];
 
                                $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
-                               $sparkle = '';
                                $url = $rr['url'];
                                if ($rr['network'] === NETWORK_DFRN) {
-                                       $sparkle = ' sparkle';
                                        $url = System::baseUrl() . '/redir/' . $rr['cid'];
                                }
 
@@ -920,11 +917,12 @@ function get_my_url()
 
 function zrl_init(App $a)
 {
-       $tmp_str = get_my_url();
-       if (validate_url($tmp_str)) {
+       $my_url = get_my_url();
+       $my_url = validate_url($my_url);
+       if ($my_url) {
                // Is it a DDoS attempt?
                // The check fetches the cached value from gprobe to reduce the load for this system
-               $urlparts = parse_url($tmp_str);
+               $urlparts = parse_url($my_url);
 
                $result = Cache::get('gprobe:' . $urlparts['host']);
                if ((!is_null($result)) && (in_array($result['network'], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
@@ -932,8 +930,8 @@ function zrl_init(App $a)
                        return;
                }
 
-               Worker::add(PRIORITY_LOW, 'GProbe', $tmp_str);
-               $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
+               Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
+               $arr = array('zrl' => $my_url, 'url' => $a->cmd);
                call_hooks('zrl_init', $arr);
        }
 }
index 4bb00cdddd34f0b0927821576215629e8a73537f..9e7a4621af9ba966b9ed4fa3757af8bc6532b95f 100644 (file)
@@ -37,13 +37,20 @@ function construct_verb($item) {
 
 /* limit_body_size()
  *
- *             The purpose of this function is to apply system message length limits to
- *             imported messages without including any embedded photos in the length
+ *
+ *
  */
-function limit_body_size($body) {
-
-//     logger('limit_body_size: start', LOGGER_DEBUG);
 
+/**
+ * The purpose of this function is to apply system message length limits to
+ * imported messages without including any embedded photos in the length
+ *
+ * @brief Truncates imported message body string length to max_import_size
+ * @param string $body
+ * @return string
+ */
+function limit_body_size($body)
+{
        $maxlen = get_max_import_size();
 
        // If the length of the body, including the embedded images, is smaller
@@ -55,7 +62,6 @@ function limit_body_size($body) {
                $orig_body = $body;
                $new_body = '';
                $textlen = 0;
-               $max_found = false;
 
                $img_start = strpos($orig_body, '[img');
                $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
@@ -110,12 +116,10 @@ function limit_body_size($body) {
                        if ($textlen < $maxlen) {
                                logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG);
                                $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
-                               $textlen = $maxlen;
                        }
                } else {
                        logger('limit_body_size: the text size with embedded images extracted did not violate the limit', LOGGER_DEBUG);
                        $new_body = $new_body . $orig_body;
-                       $textlen += strlen($orig_body);
                }
 
                return $new_body;
@@ -169,12 +173,6 @@ function add_page_info_data($data) {
                return "";
        }
 
-       if (sizeof($data["images"]) > 0) {
-               $preview = $data["images"][0];
-       } else {
-               $preview = "";
-       }
-
        // Escape some bad characters
        $data["url"] = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["url"], ENT_QUOTES, 'UTF-8', false));
        $data["title"] = str_replace(array("[", "]"), array("&#91;", "&#93;"), htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false));
@@ -854,7 +852,6 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
                        logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG);
                        $u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
                        if (DBM::is_result($u)) {
-                               $a = get_app();
                                $self = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
                                logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
                                if ((normalise_link($arr['author-link']) == $self) || (normalise_link($arr['owner-link']) == $self)) {
@@ -1051,7 +1048,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
        }
 
        // Set parent id
-       $r = dba::update('item', array('parent' => $parent_id), array('id' => $current_post));
+       dba::update('item', array('parent' => $parent_id), array('id' => $current_post));
 
        $arr['id'] = $current_post;
        $arr['parent'] = $parent_id;
@@ -1119,7 +1116,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
         * It is done after the transaction to avoid dead locks.
         */
        if ($arr['last-child']) {
-               $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d",
+               q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d",
                        dbesc($arr['uri']),
                        intval($arr['uid']),
                        intval($current_post)
@@ -1205,8 +1202,6 @@ function item_body_set_hashtags(&$item) {
        // Otherwise there could be problems with hashtags like #test and #test2
        rsort($tags);
 
-       $a = get_app();
-
        $URLSearchString = "^\[\]";
 
        // All hashtags should point to the home server if "local_tags" is activated
@@ -1315,7 +1310,6 @@ function get_item_contact($item, $contacts) {
        foreach ($contacts as $contact) {
                if ($contact['id'] == $item['contact-id']) {
                        return $contact;
-                       break; // NOTREACHED
                }
        }
        return false;
@@ -1327,16 +1321,13 @@ function get_item_contact($item, $contacts) {
  * @param int $item_id
  * @return bool true if item was deleted, else false
  */
-function tag_deliver($uid, $item_id) {
-
-       $a = get_app();
-
+function tag_deliver($uid, $item_id)
+{
        $mention = false;
 
        $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                intval($uid)
        );
-
        if (! DBM::is_result($u)) {
                return;
        }
@@ -1344,7 +1335,6 @@ function tag_deliver($uid, $item_id) {
        $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
        $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
 
-
        $i = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($item_id),
                intval($uid)
@@ -1674,15 +1664,13 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
        if (is_array($contact)) {
                if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
                        || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
-                       $r = dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+                       dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
                                        array('id' => $contact['id'], 'uid' => $importer['uid']));
                }
                // send email notification to owner?
        } else {
-
                // create contact record
-
-               $r = q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
+               q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
                        `blocked`, `readonly`, `pending`, `writable`)
                        VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
                        intval($importer['uid']),
@@ -1695,6 +1683,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
                        dbesc(NETWORK_OSTATUS),
                        intval(CONTACT_IS_FOLLOWER)
                );
+
                $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
                                intval($importer['uid']),
                                dbesc($url)
@@ -1708,9 +1697,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
                $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($importer['uid'])
                );
-
                if (DBM::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
-
                        // create notification
                        $hash = random_string();
 
@@ -1742,7 +1729,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 
                        }
                } elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
-                       $r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
+                       q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
                                        intval($importer['uid']),
                                        dbesc($url)
                        );
@@ -1798,7 +1785,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
        logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: '  . $push_url . ' with verifier ' . $verify_token);
 
        if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) {
-               $r = dba::update('contact', array('hub-verify' => $verify_token), array('id' => $contact['id']));
+               dba::update('contact', array('hub-verify' => $verify_token), array('id' => $contact['id']));
        }
 
        post_url($url, $params);
@@ -1809,16 +1796,22 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 }
 
-function fix_private_photos($s, $uid, $item = null, $cid = 0) {
-
-       if (Config::get('system','disable_embedded')) {
+/**
+ *
+ * @param string $s
+ * @param int    $uid
+ * @param array  $item
+ * @param int    $cid
+ * @return string
+ */
+function fix_private_photos($s, $uid, $item = null, $cid = 0)
+{
+       if (Config::get('system', 'disable_embedded')) {
                return $s;
        }
 
-       $a = get_app();
-
        logger('fix_private_photos: check for photos', LOGGER_DEBUG);
-       $site = substr(System::baseUrl(),strpos(System::baseUrl(),'://'));
+       $site = substr(System::baseUrl(), strpos(System::baseUrl(), '://'));
 
        $orig_body = $s;
        $new_body = '';
@@ -1826,19 +1819,18 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
        $img_start = strpos($orig_body, '[img');
        $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
        $img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false);
-       while ( ($img_st_close !== false) && ($img_len !== false) ) {
 
+       while (($img_st_close !== false) && ($img_len !== false)) {
                $img_st_close++; // make it point to AFTER the closing bracket
                $image = substr($orig_body, $img_start + $img_st_close, $img_len);
 
                logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
 
-
-               if (stristr($image , $site . '/photo/')) {
+               if (stristr($image, $site . '/photo/')) {
                        // Only embed locally hosted photos
                        $replace = false;
                        $i = basename($image);
-                       $i = str_replace(array('.jpg', '.png', '.gif'),array('', '',''), $i);
+                       $i = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $i);
                        $x = strpos($i, '-');
 
                        if ($x) {
@@ -1848,7 +1840,6 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                                        dbesc($i),
                                        intval($res),
                                        intval($uid)
-
                                );
                                if (DBM::is_result($r)) {
                                        /*
@@ -2161,7 +2152,7 @@ function drop_item($id, $interactive = true) {
                logger('delete item: ' . $item['id'], LOGGER_DEBUG);
 
                // delete the item
-               $r = dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
+               dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
                                        'edited' => datetime_convert(), 'changed' => datetime_convert()),
                                array('id' => $item['id']));
 
@@ -2229,12 +2220,12 @@ function drop_item($id, $interactive = true) {
 
                // Now delete them
                if ($parentid != "") {
-                       $r = q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid));
+                       q("DELETE FROM `sign` WHERE `iid` IN (%s)", dbesc($parentid));
                }
 
                // If it's the parent of a comment thread, kill all the kids
                if ($item['uri'] == $item['parent-uri']) {
-                       $r = dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
+                       dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
                                        'edited' => datetime_convert(), 'changed' => datetime_convert()),
                                array('parent-uri' => $item['parent-uri'], 'uid' => $item['uid']));
 
index 8b8759c2f6401b90061cb6c90092d306e3f50c0d..793ea04215e62b0be9607b667d70373c7f5ce7fd 100644 (file)
@@ -85,7 +85,7 @@ function do_like($item_id, $verb) {
                $uid = local_user();
        }
 
-       if (!can_write_wall($a, $uid)) {
+       if (!can_write_wall($uid)) {
                logger('like: unable to write on wall ' . $uid);
                return false;
        }
index e49647b6ef7c9868fe162a28a31298a6e180711c..844a803c090243ec733ae8a07e8741c831a3f923 100644 (file)
@@ -7,29 +7,32 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 
-function send_message($recipient=0, $body='', $subject='', $replyto=''){
-
+function send_message($recipient = 0, $body = '', $subject = '', $replyto = '')
+{
        $a = get_app();
 
-       if (! $recipient) return -1;
+       if (!$recipient) {
+               return -1;
+       }
 
-       if (! strlen($subject))
+       if (!strlen($subject)) {
                $subject = t('[no subject]');
+       }
 
        $me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
                intval(local_user())
        );
        $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($recipient),
-                       intval(local_user())
+               intval($recipient),
+               intval(local_user())
        );
 
-       if (! (count($me) && (count($contact)))) {
+       if (!(count($me) && (count($contact)))) {
                return -2;
        }
 
        $guid = get_guid(32);
-       $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
+       $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
        $convid = 0;
        $reply = false;
@@ -38,51 +41,50 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
        if (strlen($replyto)) {
                $reply = true;
-               $r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1",
+               $r = q("SELECT `convid` FROM `mail` WHERE `uid` = %d AND (`uri` = '%s' OR `parent-uri` = '%s') LIMIT 1",
                        intval(local_user()),
                        dbesc($replyto),
                        dbesc($replyto)
                );
-               if (DBM::is_result($r))
+               if (DBM::is_result($r)) {
                        $convid = $r[0]['convid'];
+               }
        }
 
-       if (! $convid) {
-
+       if (!$convid) {
                // create a new conversation
-
-               $recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3);
-               $recip_host = substr($recip_host,0,strpos($recip_host,'/'));
+               $recip_host = substr($contact[0]['url'], strpos($contact[0]['url'], '://') + 3);
+               $recip_host = substr($recip_host, 0, strpos($recip_host, '/'));
 
                $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
-               $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3);
+               $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
                $conv_guid = get_guid(32);
-               $convuri = $recip_handle.':'.$conv_guid;
+               $convuri = $recip_handle . ':' . $conv_guid;
 
                $handles = $recip_handle . ';' . $sender_handle;
 
                $fields = array('uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
-                               'created' => datetime_convert(), 'updated' => datetime_convert(),
-                               'subject' => $subject, 'recips' => $handles);
-               $r = dba::insert('conv', $fields);
+                       'created' => datetime_convert(), 'updated' => datetime_convert(),
+                       'subject' => $subject, 'recips' => $handles);
+               dba::insert('conv', $fields);
 
                $r = dba::select('conv', array('id'), array('guid' => $conv_guid, 'uid' => local_user()), array('limit' => 1));
-               if (DBM::is_result($r))
+               if (DBM::is_result($r)) {
                        $convid = $r['id'];
+               }
        }
 
-       if (! $convid) {
+       if (!$convid) {
                logger('send message: conversation not found.');
                return -4;
        }
 
-       if (! strlen($replyto)) {
+       if (!strlen($replyto)) {
                $replyto = $convuri;
        }
 
-
-       $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
+       q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
                `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`)
                VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
                intval(local_user()),
@@ -107,8 +109,9 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                dbesc($uri),
                intval(local_user())
        );
-       if (DBM::is_result($r))
+       if (DBM::is_result($r)) {
                $post_id = $r[0]['id'];
+       }
 
        /**
         *
@@ -121,19 +124,17 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
         * post and set them to the same permissions as the post itself.
         *
         */
-
        $match = null;
-
-       if (preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
+       if (preg_match_all("/\[img\](.*?)\[\/img\]/", $body, $match)) {
                $images = $match[1];
                if (count($images)) {
                        foreach ($images as $image) {
-                               if (! stristr($image,System::baseUrl() . '/photo/')) {
+                               if (!stristr($image, System::baseUrl() . '/photo/')) {
                                        continue;
                                }
-                               $image_uri = substr($image,strrpos($image,'/') + 1);
-                               $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
-                               $r = q("UPDATE `photo` SET `allow_cid` = '%s'
+                               $image_uri = substr($image, strrpos($image, '/') + 1);
+                               $image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
+                               q("UPDATE `photo` SET `allow_cid` = '%s'
                                        WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
                                        dbesc('<' . $recipient . '>'),
                                        dbesc($image_uri),
@@ -150,46 +151,42 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
        } else {
                return -3;
        }
-
 }
 
-function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
-
-       if (! $recipient) {
+function send_wallmessage($recipient = '', $body = '', $subject = '', $replyto = '')
+{
+       if (!$recipient) {
                return -1;
        }
 
-       if (! strlen($subject)) {
+       if (!strlen($subject)) {
                $subject = t('[no subject]');
        }
 
        $guid = get_guid(32);
-       $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
-
-       $convid = 0;
-       $reply = false;
+       $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
        $me = Probe::uri($replyto);
 
-       if (! $me['name']) {
+       if (!$me['name']) {
                return -2;
        }
 
        $conv_guid = get_guid(32);
 
-       $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3);
+       $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
        $sender_nick = basename($replyto);
-       $sender_host = substr($replyto,strpos($replyto,'://')+3);
-       $sender_host = substr($sender_host,0,strpos($sender_host,'/'));
+       $sender_host = substr($replyto, strpos($replyto, '://') + 3);
+       $sender_host = substr($sender_host, 0, strpos($sender_host, '/'));
        $sender_handle = $sender_nick . '@' . $sender_host;
 
        $handles = $recip_handle . ';' . $sender_handle;
 
        $fields = array('uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
-                       'created' => datetime_convert(), 'updated' => datetime_convert(),
-                       'subject' => $subject, 'recips' => $handles);
-       $r = dba::insert('conv', $fields);
+               'created' => datetime_convert(), 'updated' => datetime_convert(),
+               'subject' => $subject, 'recips' => $handles);
+       dba::insert('conv', $fields);
 
        $r = dba::select('conv', array('id'), array('guid' => $conv_guid, 'uid' => $recipient['uid']), array('limit' => 1));
        if (!DBM::is_result($r)) {
@@ -199,7 +196,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
        $convid = $r['id'];
 
-       $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
+       q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
                `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
                VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
                intval($recipient['uid']),
@@ -221,5 +218,4 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
        );
 
        return 0;
-
 }
index 58ec150e7ad21bbbdbadaee68240e908b8f92ae6..1bc9a3ae1d34ce602154c6d30e2a141e0c173577 100644 (file)
@@ -147,10 +147,10 @@ function nav_info(App $a)
                if (strlen($gdir)) {
                        $gdirpath = zrl($gdir, true);
                }
-       } elseif (Config::get('system', 'community_page_style') == CP_USERS_ON_SERVER) {
-               $nav['community'] = array('community', t('Community'), '', t('Conversations on this site'));
-       } elseif (Config::get('system', 'community_page_style') == CP_GLOBAL_COMMUNITY) {
-               $nav['community'] = array('community', t('Community'), '', t('Conversations on the network'));
+       }
+
+       if (local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) {
+               $nav['community'] = array('community', t('Community'), '', t('Conversations on this and other servers'));
        }
 
        if (local_user()) {
@@ -230,6 +230,7 @@ function nav_info(App $a)
 function nav_set_selected($item){
        $a = get_app();
        $a->nav_sel = array(
+               'global'        => null,
                'community'     => null,
                'network'       => null,
                'home'          => null,
index 2f8b24b8b653d65e2bb9fbce3c0e1de07286148d..561c7aa9489a6305009f250bf23f6e38d525e6e3 100644 (file)
@@ -232,8 +232,6 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array())
        $a->set_curl_code($http_code);
        $a->set_curl_content_type($curl_info['content_type']);
 
-       $body = substr($s, strlen($header));
-
        $rc = intval($http_code);
        $ret['return_code'] = $rc;
        $ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false);
@@ -470,26 +468,28 @@ function http_status_exit($val, $description = array())
  * and check DNS to see if it's real (or check if is a valid IP address)
  *
  * @param string $url The URL to be validated
- * @return boolean True if it's a valid URL, fals if something wrong with it
+ * @return string|boolean The actual working URL, false else
  */
-function validate_url(&$url)
+function validate_url($url)
 {
        if (Config::get('system', 'disable_url_validation')) {
-               return true;
+               return $url;
        }
 
        // no naked subdomains (allow localhost for tests)
-       if (strpos($url, '.') === false && strpos($url, '/localhost/') === false)
+       if (strpos($url, '.') === false && strpos($url, '/localhost/') === false) {
                return false;
+       }
 
-       if (substr($url, 0, 4) != 'http')
+       if (substr($url, 0, 4) != 'http') {
                $url = 'http://' . $url;
+       }
 
-       /// @TODO Really supress function outcomes? Why not find them + debug them?
+       /// @TODO Really suppress function outcomes? Why not find them + debug them?
        $h = @parse_url($url);
 
        if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
-               return true;
+               return $url;
        }
 
        return false;
@@ -691,8 +691,6 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
                $include_link = false;
        }
 
-       $a = get_app();
-
        // Picture addresses can contain special characters
        $s = htmlspecialchars_decode($srctext);
 
@@ -866,7 +864,6 @@ function original_url($url, $depth = 1, $fetchbody = false)
 
        $stamp1 = microtime(true);
 
-       $siteinfo = array();
        $ch = curl_init();
        curl_setopt($ch, CURLOPT_URL, $url);
        curl_setopt($ch, CURLOPT_HEADER, 1);
@@ -875,7 +872,7 @@ function original_url($url, $depth = 1, $fetchbody = false)
        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
        curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
 
-       $header = curl_exec($ch);
+       curl_exec($ch);
        $curl_info = @curl_getinfo($ch);
        $http_code = $curl_info['http_code'];
        curl_close($ch);
@@ -947,7 +944,6 @@ function original_url($url, $depth = 1, $fetchbody = false)
                if (@$attr["http-equiv"] == 'refresh') {
                        $path = $attr["content"];
                        $pathinfo = explode(";", $path);
-                       $content = "";
                        foreach ($pathinfo as $value) {
                                if (substr(strtolower($value), 0, 4) == "url=") {
                                        return(original_url(substr($value, 4), ++$depth));
@@ -956,7 +952,7 @@ function original_url($url, $depth = 1, $fetchbody = false)
                }
        }
 
-       return($url);
+       return $url;
 }
 
 function short_link($url)
index 5931cba5737ca158c1340b97009216a76eee9f18..86acad6cfe730209cce2c3070ac4bb02c526ac69 100644 (file)
@@ -292,30 +292,38 @@ function get_attached_data($body, $item = array()) {
        return $post;
 }
 
-function shortenmsg($msg, $limit, $twitter = false) {
-       /// @TODO
-       /// For Twitter URLs aren't shortened, but they have to be calculated as if.
-
+/**
+ * Shortens message
+ *
+ * @param type $msg
+ * @param type $limit
+ * @return type
+ *
+ * @todo For Twitter URLs aren't shortened, but they have to be calculated as if.
+ */
+function shortenmsg($msg, $limit)
+{
        $lines = explode("\n", $msg);
        $msg = "";
        $recycle = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
        $ellipsis = html_entity_decode("&#x2026;", ENT_QUOTES, 'UTF-8');
-       foreach ($lines AS $row=>$line) {
-               if (iconv_strlen(trim($msg."\n".$line), "UTF-8") <= $limit)
-                       $msg = trim($msg."\n".$line);
-               // Is the new message empty by now or is it a reshared message?
-               elseif (($msg == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle)))
-                       $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis;
-               else
+       foreach ($lines AS $row => $line) {
+               if (iconv_strlen(trim($msg . "\n" . $line), "UTF-8") <= $limit) {
+                       $msg = trim($msg . "\n" . $line);
+               } elseif (($msg == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle))) {
+                       // Is the new message empty by now or is it a reshared message?
+                       $msg = iconv_substr(iconv_substr(trim($msg . "\n" . $line), 0, $limit, "UTF-8"), 0, -3, "UTF-8") . $ellipsis;
+               } else {
                        break;
+               }
        }
-       return($msg);
+
+       return $msg;
 }
 
 /**
  * @brief Convert a message into plaintext for connectors to other networks
  *
- * @param App $a The application class
  * @param array $b The message array that is about to be posted
  * @param int $limit The maximum number of characters when posting to that network
  * @param bool $includedlinks Has an attached link to be included into the message?
@@ -324,7 +332,7 @@ function shortenmsg($msg, $limit, $twitter = false) {
  *
  * @return string The converted message
  */
-function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
+function plaintext($b, $limit = 0, $includedlinks = false, $htmlmode = 2, $target_network = "") {
 
        // Remove the hash tags
        $URLSearchString = "^\[\]";
index 276c36bd2181746d1c76ce5120e434a674ad8c19..34f8c13716b44e65495b939da40b8761a920dba1 100644 (file)
@@ -182,14 +182,15 @@ function load_hooks() {
  * @param string $name of the hook to call
  * @param string|array &$data to transmit to the callback handler
  */
-function call_hooks($name, &$data = null) {
-       $stamp1 = microtime(true);
-
+function call_hooks($name, &$data = null)
+{
        $a = get_app();
 
-       if (is_array($a->hooks) && array_key_exists($name, $a->hooks))
-               foreach ($a->hooks[$name] as $hook)
+       if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
+               foreach ($a->hooks[$name] as $hook) {
                        call_single_hook($a, $name, $hook, $data);
+               }
+       }
 }
 
 /**
index 0d223709e2d506acdc743752d727510837cdd622..fd72d888e5b6604a31596380fc2f8428b103e50e 100644 (file)
@@ -144,7 +144,7 @@ function post_update_1194() {
 
        logger("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, LOGGER_DEBUG);
 
-       $r = q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,
+       q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,
                intval($start_id), intval($pos_id),
                dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
 
index af6c0d96c4f6373b109f2f382da601b38771ef06..9e9dee0253facce2630bae59a36fbec672a6557e 100644 (file)
@@ -16,7 +16,7 @@ function gender_selector($current="",$suffix="") {
        }
        $o .= '</select>';
        return $o;
-}      
+}
 
 function sexpref_selector($current="",$suffix="") {
        $o = '';
@@ -34,16 +34,17 @@ function sexpref_selector($current="",$suffix="") {
        }
        $o .= '</select>';
        return $o;
-}      
+}
 
 
-function marital_selector($current="",$suffix="") {
+function marital_selector($current = "")
+{
        $o = '';
-       $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') );
+       $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me'));
 
        call_hooks('marital_selector', $select);
 
-       $o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
+       $o .= '<select name="marital" id="marital-select" size="1" >';
        foreach ($select as $selection) {
                if ($selection !== 'NOTRANSLATION') {
                        $selected = (($selection == $current) ? ' selected="selected" ' : '');
@@ -52,4 +53,4 @@ function marital_selector($current="",$suffix="") {
        }
        $o .= '</select>';
        return $o;
-}      
+}
index c4ab229aee3cd10444b1de60431c807721381224..a9e0522011c1d5b41fe3ccfd00a0f2493c9f8312 100644 (file)
@@ -24,8 +24,6 @@ function remove_queue_item($id) {
  * @return bool The communication with this contact has currently problems
  */
 function was_recently_delayed($cid) {
-       $was_delayed = false;
-
        // Are there queue entries that were recently added?
        $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
                AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
@@ -59,7 +57,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
                $batch_queue = 1000;
        }
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+       $r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
                WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
                intval($cid)
        );
index 060d0e9bf30deadf86fbed96d49ba2eb61ca5a4e..dac03f92c7e1153b5dc6dfda97e337cb2ea639c5 100644 (file)
@@ -4,18 +4,18 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-function auto_redir(App $a, $contact_nick) {
-
+function auto_redir(App $a, $contact_nick)
+{
        // prevent looping
-
-       if (x($_REQUEST,'redir') && intval($_REQUEST['redir']))
+       if (x($_REQUEST,'redir') && intval($_REQUEST['redir'])) {
                return;
+       }
 
-       if ((! $contact_nick) || ($contact_nick === $a->user['nickname']))
+       if ((! $contact_nick) || ($contact_nick === $a->user['nickname'])) {
                return;
+       }
 
        if (local_user()) {
-
                // We need to find out if $contact_nick is a user on this hub, and if so, if I
                // am a contact of that user. However, that user may have other contacts with the
                // same nickname as me on other hubs or other networks. Exclude these by requiring
@@ -26,8 +26,9 @@ function auto_redir(App $a, $contact_nick) {
 
                $baseurl = System::baseUrl();
                $domain_st = strpos($baseurl, "://");
-               if ($domain_st === false)
+               if ($domain_st === false) {
                        return;
+               }
                $baseurl = substr($baseurl, $domain_st + 3);
                $nurl = normalise_link($baseurl);
 
@@ -39,7 +40,6 @@ function auto_redir(App $a, $contact_nick) {
                                dbesc($baseurl),
                                dbesc($nurl)
                );
-
                if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
                        return;
                }
@@ -51,14 +51,13 @@ function auto_redir(App $a, $contact_nick) {
                       intval(local_user()),
                       dbesc($baseurl)
                );
-
                if (! DBM::is_result($r)) {
                        return;
                }
 
                $cid = $r[0]['id'];
 
-               $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+               $dfrn_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
 
                if ($r[0]['duplex'] && $r[0]['issued-id']) {
                        $orig_id = $r[0]['issued-id'];
@@ -72,8 +71,9 @@ function auto_redir(App $a, $contact_nick) {
                // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode
                // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues
 
-               if (strlen($dfrn_id) < 3)
+               if (strlen($dfrn_id) < 3) {
                        return;
+               }
 
                $sec = random_string();
 
index 6f6ef94b6937cba12c154fa37dfc1e0dce6427c3..3cdfb4f28d83ab6921d6f3f152def8b886cacbf3 100644 (file)
@@ -5,6 +5,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Group;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
@@ -13,10 +14,11 @@ use Friendica\Database\DBM;
  *
  * @return string Hashed data
  */
-function cookie_hash($user) {
-       return(hash("sha256", Config::get("system", "site_prvkey").
-                               $user["prvkey"].
-                               $user["password"]));
+function cookie_hash($user)
+{
+       return(hash("sha256", Config::get("system", "site_prvkey") .
+                       $user["prvkey"] .
+                       $user["password"]));
 }
 
 /**
@@ -25,28 +27,35 @@ function cookie_hash($user) {
  * @param int $time
  * @param array $user Record from "user" table
  */
-function new_cookie($time, $user = array()) {
-
+function new_cookie($time, $user = array())
+{
        if ($time != 0) {
                $time = $time + time();
        }
 
        if ($user) {
                $value = json_encode(array("uid" => $user["uid"],
-                                       "hash" => cookie_hash($user),
-                                       "ip" => $_SERVER['REMOTE_ADDR']));
-       }
-       else {
+                       "hash" => cookie_hash($user),
+                       "ip" => $_SERVER['REMOTE_ADDR']));
+       } else {
                $value = "";
        }
 
-       setcookie("Friendica", $value, $time, "/", "",
-               (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
-
+       setcookie("Friendica", $value, $time, "/", "", (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
 }
 
-function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) {
-
+/**
+ * @brief Sets the provided user's authenticated session
+ *
+ * @todo Should be moved to Friendica\Core\Session once it's created
+ *
+ * @param type $user_record
+ * @param type $login_initial
+ * @param type $interactive
+ * @param type $login_refresh
+ */
+function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false)
+{
        $a = get_app();
 
        $_SESSION['uid'] = $user_record['uid'];
@@ -55,7 +64,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        $_SESSION['authenticated'] = 1;
        $_SESSION['page_flags'] = $user_record['page-flags'];
        $_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname'];
-       $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
+       $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
        $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
        $a->user = $user_record;
@@ -64,10 +73,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                if ($a->user['login_date'] <= NULL_DATE) {
                        $_SESSION['return_url'] = 'profile_photo/new';
                        $a->module = 'profile_photo';
-                       info( t("Welcome ") . $a->user['username'] . EOL);
-                       info( t('Please upload a profile photo.') . EOL);
+                       info(t("Welcome ") . $a->user['username'] . EOL);
+                       info(t('Please upload a profile photo.') . EOL);
                } else {
-                       info( t("Welcome back ") . $a->user['username'] . EOL);
+                       info(t("Welcome back ") . $a->user['username'] . EOL);
                }
        }
 
@@ -84,7 +93,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
        $master_record = $a->user;
 
-       if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
+       if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
                $r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1",
                        intval($_SESSION['submanage'])
                );
@@ -112,10 +121,10 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        }
 
        if ($login_initial) {
-               logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
+               logger('auth_identities: ' . print_r($a->identities, true), LOGGER_DEBUG);
        }
        if ($login_refresh) {
-               logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
+               logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
        }
 
        $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']);
@@ -125,7 +134,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                $_SESSION['cid'] = $a->cid;
        }
 
-       header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+       header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] . '"');
 
        if ($login_initial || $login_refresh) {
                dba::update('user', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid']));
@@ -141,7 +150,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
                // The cookie will be renewed automatically.
                // The week ensures that sessions will expire after some inactivity.
                if ($_SESSION['remember']) {
-                       logger('Injecting cookie for remembered user '. $_SESSION['remember_user']['nickname']);
+                       logger('Injecting cookie for remembered user ' . $_SESSION['remember_user']['nickname']);
                        new_cookie(604800, $user_record);
                        unset($_SESSION['remember']);
                }
@@ -156,27 +165,22 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        }
 }
 
-
-
-function can_write_wall(App $a, $owner) {
-
+function can_write_wall($owner)
+{
        static $verified = 0;
 
-       if ((! (local_user())) && (! (remote_user()))) {
+       if (!local_user() && !remote_user()) {
                return false;
        }
 
        $uid = local_user();
-
-       if (($uid) && ($uid == $owner)) {
+       if ($uid == $owner) {
                return true;
        }
 
        if (remote_user()) {
-
                // use remembered decision and avoid a DB lookup for each and every display item
                // DO NOT use this function if there are going to be multiple owners
-
                // We have a contact-id for an authenticated remote user, this block determines if the contact
                // belongs to this page owner, and has the necessary permissions to post content
 
@@ -196,7 +200,7 @@ function can_write_wall(App $a, $owner) {
                                }
                        }
 
-                       if (! $cid) {
+                       if (!$cid) {
                                return false;
                        }
 
@@ -213,8 +217,7 @@ function can_write_wall(App $a, $owner) {
                        if (DBM::is_result($r)) {
                                $verified = 2;
                                return true;
-                       }
-                       else {
+                       } else {
                                $verified = 1;
                        }
                }
@@ -223,9 +226,8 @@ function can_write_wall(App $a, $owner) {
        return false;
 }
 
-
-function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
-
+function permissions_sql($owner_id, $remote_verified = false, $groups = null)
+{
        $local_user = local_user();
        $remote_user = remote_user();
 
@@ -243,8 +245,7 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
        /**
         * Profile owner - everything is visible
         */
-
-       if (($local_user) && ($local_user == $owner_id)) {
+       if ($local_user && $local_user == $owner_id) {
                $sql = '';
        } elseif ($remote_user) {
                /*
@@ -255,18 +256,18 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
                 * done this and passed the groups into this function.
                 */
 
-               if (! $remote_verified) {
+               if (!$remote_verified) {
                        $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
                                intval($remote_user),
                                intval($owner_id)
                        );
                        if (DBM::is_result($r)) {
                                $remote_verified = true;
-                               $groups = init_groups_visitor($remote_user);
+                               $groups = Group::getIdsByContactId($remote_user);
                        }
                }
-               if ($remote_verified) {
 
+               if ($remote_verified) {
                        $gs = '<<>>'; // should be impossible to match
 
                        if (is_array($groups) && count($groups)) {
@@ -274,20 +275,6 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
                                        $gs .= '|<' . intval($g) . '>';
                        }
 
-                       /*
-                        * @TODO old-lost code found?
-                       $sql = sprintf(
-                               " AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
-                                 AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' )
-                                 AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
-                                 AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s')
-                               ",
-                               intval($remote_user),
-                               intval($remote_user),
-                               dbesc($gs),
-                               dbesc($gs)
-                       );
-                       */
                        $sql = sprintf(
                                " AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
                                  AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') )
@@ -303,13 +290,12 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
        return $sql;
 }
 
-
-function item_permissions_sql($owner_id, $remote_verified = false, $groups = null) {
-
+function item_permissions_sql($owner_id, $remote_verified = false, $groups = null)
+{
        $local_user = local_user();
        $remote_user = remote_user();
 
-       /**
+       /*
         * Construct permissions
         *
         * default permissions - anonymous user
@@ -321,9 +307,7 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
                         AND `item`.private = 0
        ";
 
-       /**
-        * Profile owner - everything is visible
-        */
+       // Profile owner - everything is visible
        if ($local_user && ($local_user == $owner_id)) {
                $sql = '';
        } elseif ($remote_user) {
@@ -334,14 +318,14 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
                 * If pre-verified, the caller is expected to have already
                 * done this and passed the groups into this function.
                 */
-               if (! $remote_verified) {
+               if (!$remote_verified) {
                        $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
                                intval($remote_user),
                                intval($owner_id)
                        );
                        if (DBM::is_result($r)) {
                                $remote_verified = true;
-                               $groups = init_groups_visitor($remote_user);
+                               $groups = Group::getIdsByContactId($remote_user);
                        }
                }
                if ($remote_verified) {
@@ -355,16 +339,6 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
                        }
 
                        $sql = sprintf(
-                               /*" AND ( private = 0 OR ( private in (1,2) AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
-                                 AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' )
-                                 AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
-                                 AND ( deny_gid  = '' OR NOT deny_gid REGEXP '%s')))
-                               ",
-                               intval($remote_user),
-                               intval($remote_user),
-                               dbesc($gs),
-                               dbesc($gs)
-*/
                                " AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1
                                  AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s')
                                  AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = '')))))
@@ -380,7 +354,6 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
        return $sql;
 }
 
-
 /*
  * Functions used to protect against Cross-Site Request Forgery
  * The security token has to base on at least one value that an attacker can't know - here it's the session ID and the private key.
@@ -392,7 +365,8 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
  *    Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes they still are,
  *    so this mechanism brings in some damage control (the attacker would be able to forge a request to a form of this type, but not to forms of other types).
  */
-function get_form_security_token($typename = '') {
+function get_form_security_token($typename = '')
+{
        $a = get_app();
 
        $timestamp = time();
@@ -401,7 +375,8 @@ function get_form_security_token($typename = '') {
        return $timestamp . '.' . $sec_hash;
 }
 
-function check_form_security_token($typename = '', $formname = 'form_security_token') {
+function check_form_security_token($typename = '', $formname = 'form_security_token')
+{
        if (!x($_REQUEST, $formname)) {
                return false;
        }
@@ -423,19 +398,24 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
        return ($sec_hash == $x[1]);
 }
 
-function check_form_security_std_err_msg() {
+function check_form_security_std_err_msg()
+{
        return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
 }
-function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
+
+function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token')
+{
        if (!check_form_security_token($typename, $formname)) {
                $a = get_app();
                logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
                logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
-               notice( check_form_security_std_err_msg() );
-               goaway(System::baseUrl() . $err_redirect );
+               notice(check_form_security_std_err_msg());
+               goaway(System::baseUrl() . $err_redirect);
        }
 }
-function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
+
+function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token')
+{
        if (!check_form_security_token($typename, $formname)) {
                $a = get_app();
                logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
@@ -445,21 +425,12 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
        }
 }
 
-// Returns an array of group id's this contact is a member of.
-// This array will only contain group id's related to the uid of this
-// DFRN contact. They are *not* neccessarily unique across the entire site.
-
-
-if (! function_exists('init_groups_visitor')) {
-function init_groups_visitor($contact_id) {
-       $groups = array();
-       $r = q("SELECT `gid` FROM `group_member`
-               WHERE `contact-id` = %d ",
-               intval($contact_id)
-       );
-       if (DBM::is_result($r)) {
-               foreach ($r as $rr)
-                       $groups[] = $rr['gid'];
-       }
-       return $groups;
-}}
+/**
+ * @brief Kills the "Friendica" cookie and all session data
+ */
+function nuke_session()
+{
+       new_cookie(-3600); // make sure cookie is deleted on browser close, as a security measure
+       session_unset();
+       session_destroy();
+}
index 66df498fe076d11d54bf86783d547c5aeaccb5db..b1619e90f5faa83fda5d18766ca050c436a08988 100644 (file)
@@ -9,7 +9,7 @@ use Friendica\Database\DBM;
 $session_exists = 0;
 $session_expire = 180000;
 
-function ref_session_open($s, $n)
+function ref_session_open()
 {
        return true;
 }
@@ -109,7 +109,7 @@ function ref_session_destroy($id)
        return true;
 }
 
-function ref_session_gc($expire)
+function ref_session_gc()
 {
        dba::delete('session', array("`expire` < ?", time()));
        return true;
index 584ed30e5b09a8239d74d5443c84aec4f2e1c7a9..50fe1e49096b5c0687eedd703f510a13c9e0666f 100644 (file)
@@ -97,7 +97,7 @@ function create_tags_from_item($itemid)
                        $global = (count($isglobal) > 0);
                }
 
-               $r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`, `guid`, `created`, `received`, `global`)
+               q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`, `guid`, `created`, `received`, `global`)
                                VALUES (%d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', %d)",
                        intval($message['uid']), intval($itemid), intval(TERM_OBJ_POST), intval($type), dbesc($term),
                        dbesc($link), dbesc($message['guid']), dbesc($message['created']), dbesc($message['received']), intval($global));
index 5a24c68ed3b1fe562dae509c4d62a8072135d7d7..0b763d687c69294752cbc64ade24f198748fc932 100644 (file)
@@ -1003,7 +1003,6 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
        $redir = false;
 
        if ($redirect) {
-               $a = get_app();
                $redirect_url = 'redir/' . $contact['id'];
                if (local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) {
                        $redir = true;
@@ -1041,8 +1040,6 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
  * @param boolean $savedsearch show save search button
  */
 function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) {
-       $a = get_app();
-
        $values = array(
                        '$s' => htmlspecialchars($s),
                        '$id' => $id,
@@ -1471,9 +1468,8 @@ function prepare_text($text) {
  *       ]
  *  ]
  */
-function get_cats_and_terms($item) {
-
-       $a = get_app();
+function get_cats_and_terms($item)
+{
        $categories = array();
        $folders = array();
 
@@ -1901,9 +1897,10 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 function file_tag_save_file($uid, $item, $file) {
        require_once "include/files.php";
 
-       $result = false;
-       if (! intval($uid))
+       if (! intval($uid)) {
                return false;
+       }
+
        $r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($item),
                intval($uid)
@@ -1931,9 +1928,9 @@ function file_tag_save_file($uid, $item, $file) {
 function file_tag_unsave_file($uid, $item, $file, $cat = false) {
        require_once "include/files.php";
 
-       $result = false;
-       if (! intval($uid))
+       if (! intval($uid)) {
                return false;
+       }
 
        if ($cat == true) {
                $pattern = '<' . file_tag_encode($file) . '>' ;
@@ -1943,7 +1940,6 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
                $termtype = TERM_FILE;
        }
 
-
        $r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($item),
                intval($uid)
@@ -1964,8 +1960,8 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
                dbesc($file),
                intval(TERM_OBJ_POST),
                intval($termtype),
-               intval($uid));
-
+               intval($uid)
+       );
        if (!DBM::is_result($r)) {
                $saved = PConfig::get($uid, 'system', 'filetags');
                PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
index a20646cb0f06253622413a2d26c1651a6815884e..711478fe1ed7f3e3974940db564989aa467e4dee 100644 (file)
--- a/index.php
+++ b/index.php
@@ -14,6 +14,7 @@ use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Module\Login;
 
 require_once 'boot.php';
 
@@ -149,9 +150,7 @@ if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
 
 // header('Link: <' . System::baseUrl() . '/amcd>; rel="acct-mgmt";');
 
-if (x($_COOKIE, "Friendica") || (x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || ($a->module === 'login')) {
-       require "include/auth.php";
-}
+Login::sessionAuth();
 
 if (! x($_SESSION, 'authenticated')) {
        header('X-Account-Management-Status: none');
index 0fab9647cb55f5d7a2e54f39e0578cc3417dee85..306ef91e0b1422f2dbab4dde4d7376f81b20ccd5 100644 (file)
@@ -13,6 +13,7 @@ use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
+use Friendica\Module\Login;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -153,7 +154,7 @@ function admin_post(App $a)
 function admin_content(App $a)
 {
        if (!is_site_admin()) {
-               return login(false);
+               return Login::form();
        }
 
        if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
@@ -1180,7 +1181,8 @@ function admin_page_site(App $a)
        $community_page_style_choices = array(
                CP_NO_COMMUNITY_PAGE => t("No community page"),
                CP_USERS_ON_SERVER => t("Public postings from users of this site"),
-               CP_GLOBAL_COMMUNITY => t("Global community page")
+               CP_GLOBAL_COMMUNITY => t("Public postings from the federated network"),
+               CP_USERS_AND_GLOBAL => t("Public postings from local users and the federated network")
        );
 
        /* OStatus conversation poll choices */
@@ -1317,7 +1319,7 @@ function admin_page_site(App $a)
                '$no_multi_reg'         => array('no_multi_reg', t("Block multiple registrations"),  Config::get('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
                '$no_openid'            => array('no_openid', t("OpenID support"), !Config::get('system','no_openid'), t("OpenID support for registration and logins.")),
                '$no_regfullname'       => array('no_regfullname', t("Fullname check"), !Config::get('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
-               '$community_page_style' => array('community_page_style', t("Community Page Style"), Config::get('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
+               '$community_page_style' => array('community_page_style', t("Community pages for visitors"), Config::get('system','community_page_style'), t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices),
                '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
                '$ostatus_disabled'     => array('ostatus_disabled', t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
                '$ostatus_full_threads' => array('ostatus_full_threads', t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")),
index cda97c729ce9bb5bfc80c622ede8530de4387938..69d7311a0b80572e2c76feb8ead8d1254cc07f01 100644 (file)
@@ -3,10 +3,12 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
+use Friendica\Module\Login;
 
 require_once('include/api.php');
 
-function oauth_get_client($request){
+function oauth_get_client($request)
+{
 
 
        $params = $request->get_parameters();
@@ -15,8 +17,7 @@ function oauth_get_client($request){
        $r = q("SELECT `clients`.*
                        FROM `clients`, `tokens`
                        WHERE `clients`.`client_id`=`tokens`.`client_id`
-                       AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'",
-                       dbesc($token));
+                       AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token));
 
        if (!DBM::is_result($r))
                return null;
@@ -24,57 +25,57 @@ function oauth_get_client($request){
        return $r[0];
 }
 
-function api_post(App $a) {
-
-       if (! local_user()) {
-               notice( t('Permission denied.') . EOL);
+function api_post(App $a)
+{
+       if (!local_user()) {
+               notice(t('Permission denied.') . EOL);
                return;
        }
 
-       if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
-               notice( t('Permission denied.') . EOL);
+       if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+               notice(t('Permission denied.') . EOL);
                return;
        }
-
 }
 
-function api_content(App $a) {
-       if ($a->cmd=='api/oauth/authorize'){
+function api_content(App $a)
+{
+       if ($a->cmd == 'api/oauth/authorize') {
                /*
                 * api/oauth/authorize interact with the user. return a standard page
                 */
 
                $a->page['template'] = "minimal";
 
-
                // get consumer/client from request token
                try {
                        $request = OAuthRequest::from_request();
-               } catch(Exception $e) {
-                       echo "<pre>"; var_dump($e); killme();
+               } catch (Exception $e) {
+                       echo "<pre>";
+                       var_dump($e);
+                       killme();
                }
 
-
-               if (x($_POST,'oauth_yes')){
-
+               if (x($_POST, 'oauth_yes')) {
                        $app = oauth_get_client($request);
-                       if (is_null($app)) return "Invalid request. Unknown token.";
+                       if (is_null($app)) {
+                               return "Invalid request. Unknown token.";
+                       }
                        $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
 
-                       $verifier = md5($app['secret'].local_user());
+                       $verifier = md5($app['secret'] . local_user());
                        Config::set("oauth", $verifier, local_user());
 
-
-                       if ($consumer->callback_url!=null) {
+                       if ($consumer->callback_url != null) {
                                $params = $request->get_parameters();
-                               $glue="?";
-                               if (strstr($consumer->callback_url,$glue)) $glue="?";
-                               goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier));
+                               $glue = "?";
+                               if (strstr($consumer->callback_url, $glue)) {
+                                       $glue = "?";
+                               }
+                               goaway($consumer->callback_url . $glue . "oauth_token=" . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuthUtil::urlencode_rfc3986($verifier));
                                killme();
                        }
 
-
-
                        $tpl = get_markup_template("oauth_authorize_done.tpl");
                        $o = replace_macros($tpl, array(
                                '$title' => t('Authorize application connection'),
@@ -83,31 +84,27 @@ function api_content(App $a) {
                        ));
 
                        return $o;
-
-
                }
 
-
-               if (! local_user()) {
+               if (!local_user()) {
                        /// @TODO We need login form to redirect to this page
-                       notice( t('Please login to continue.') . EOL );
-                       return login(false,$request->get_parameters());
+                       notice(t('Please login to continue.') . EOL);
+                       return Login::form($a->query_string, false, $request->get_parameters());
                }
                //FKOAuth1::loginUser(4);
 
                $app = oauth_get_client($request);
-               if (is_null($app)) return "Invalid request. Unknown token.";
-
-
-
+               if (is_null($app)) {
+                       return "Invalid request. Unknown token.";
+               }
 
                $tpl = get_markup_template('oauth_authorize.tpl');
                $o = replace_macros($tpl, array(
                        '$title' => t('Authorize application connection'),
                        '$app' => $app,
                        '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
-                       '$yes'  => t('Yes'),
-                       '$no'   => t('No'),
+                       '$yes' => t('Yes'),
+                       '$no' => t('No'),
                ));
 
                return $o;
index 785a2fbea1014d0e8bce535617f259616dd3cc64..2e0d449711eb569cf6c832a06f9b394197f66608 100644 (file)
@@ -2,23 +2,26 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Module\Login;
 
 require_once('include/conversation.php');
 require_once('include/items.php');
 
-function bookmarklet_init(App $a) {
+function bookmarklet_init(App $a)
+{
        $_GET["mode"] = "minimal";
 }
 
-function bookmarklet_content(App $a) {
+function bookmarklet_content(App $a)
+{
        if (!local_user()) {
-               $o = '<h2>'.t('Login').'</h2>';
-               $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
+               $o = '<h2>' . t('Login') . '</h2>';
+               $o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true);
                return $o;
        }
 
        $referer = normalise_link($_SERVER["HTTP_REFERER"]);
-       $page = normalise_link(System::baseUrl()."/bookmarklet");
+       $page = normalise_link(System::baseUrl() . "/bookmarklet");
 
        if (!strstr($referer, $page)) {
                $content = add_page_info($_REQUEST["url"]);
@@ -30,18 +33,17 @@ function bookmarklet_content(App $a) {
                        'nickname' => $a->user['nickname'],
                        'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'),
                        'default_perms' => get_acl_permissions($a->user),
-                       'acl' => populate_acl($a->user,true),
+                       'acl' => populate_acl($a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        'title' => trim($_REQUEST["title"], "*"),
                        'content' => $content
                );
-               $o = status_editor($a,$x, 0, false);
+               $o = status_editor($a, $x, 0, false);
                $o .= "<script>window.resizeTo(800,550);</script>";
        } else {
-               $o = '<h2>'.t('The post was created').'</h2>';
+               $o = '<h2>' . t('The post was created') . '</h2>';
                $o .= "<script>window.close()</script>";
        }
 
index cef9857ea934d84bf794682d2c4744453b6784c4..312489ef72983d7284a9de2cbd45936fbcff52f3 100644 (file)
@@ -12,6 +12,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Group;
 
 require_once 'include/event.php';
 require_once 'include/redir.php';
@@ -127,7 +128,7 @@ function cal_content(App $a) {
                }
        }
        if($contact_id) {
-               $groups = init_groups_visitor($contact_id);
+               $groups = Group::getIdsByContactId($contact_id);
                $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($contact_id),
                        intval($a->profile['profile_uid'])
index df21263278b7f60c82abf9b7fb8e6f134a03d56a..a75a3cf7dd449d06dd63b26cf99d40f80cb2dd02 100644 (file)
@@ -2,10 +2,11 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 
 function community_init(App $a) {
-       if (! local_user()) {
+       if (!local_user()) {
                unset($_SESSION['theme']);
                unset($_SESSION['mobile-theme']);
        }
@@ -14,44 +15,102 @@ function community_init(App $a) {
 function community_content(App $a, $update = 0) {
        $o = '';
 
-       if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
+       if (Config::get('system','block_public') && !local_user() && !remote_user()) {
+               notice(t('Public access denied.') . EOL);
                return;
        }
 
-       if (Config::get('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
-               notice( t('Not available.') . EOL);
+       $page_style = Config::get('system','community_page_style');
+
+       if ($a->argc > 1) {
+               $content = $a->argv[1];
+       } else {
+               // When only the global community is allowed, we use this as default
+               $content = $page_style == CP_GLOBAL_COMMUNITY ? 'global' : 'local';
+       }
+
+       if (!in_array($content, ['local', 'global'])) {
+               notice(t('Community option not available.') . EOL);
                return;
        }
 
-       require_once("include/bbcode.php");
-       require_once('include/security.php');
-       require_once('include/conversation.php');
+       // Check if we are allowed to display the content to visitors
+       if (!local_user()) {
+               $available = $page_style == CP_USERS_AND_GLOBAL;
 
-       if (! $update) {
-               nav_set_selected('community');
+               if (!$available) {
+                       $available = ($page_style == CP_USERS_ON_SERVER) && ($content == 'local');
+               }
+
+               if (!$available) {
+                       $available = ($page_style == CP_GLOBAL_COMMUNITY) && ($content == 'global');
+               }
+
+               if (!$available) {
+                       notice(t('Not available.') . EOL);
+                       return;
+               }
        }
 
-       if (x($a->data,'search')) {
-               $search = notags(trim($a->data['search']));
-       } else {
-               $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+       require_once 'include/bbcode.php';
+       require_once 'include/security.php';
+       require_once 'include/conversation.php';
+
+       if (!$update) {
+               $tabs = [];
+
+               if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) {
+                       $tabs[] = array('label'=>t('Community'),
+                                       'url' => 'community/local',
+                                       'sel' => $content == 'local' ? 'active' : '',
+                                       'title' => t('Posts from local users on this server'),
+                                       'id' => 'community-local-tab',
+                                       'accesskey' => 'l');
+               }
+
+               if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) {
+                       $tabs[] = array('label' => t('Global Timeline'),
+                                       'url' => 'community/global',
+                                       'sel' => $content == 'global' ? 'active' : '',
+                                       'title' => t('Posts from users of the federated network'),
+                                       'id'    => 'community-global-tab',
+                                       'accesskey' => 'g');
+               }
+
+               $tab_tpl = get_markup_template('common_tabs.tpl');
+               $o .= replace_macros($tab_tpl, array('$tabs' => $tabs));
+
+               nav_set_selected('community');
        }
 
-       // Here is the way permissions work in this module...
-       // Only public posts can be shown
-       // OR your own posts if you are a logged in member
+       if (Config::get('system', 'comment_public')) {
+               // check if we serve a mobile device and get the user settings
+               // accordingly
+               if ($a->is_mobile) {
+                       $itemspage_network = PConfig::get(local_user(),'system','itemspage_mobile_network', 20);
+               } else {
+                       $itemspage_network = PConfig::get(local_user(),'system','itemspage_network', 40);
+               }
+
+               // now that we have the user settings, see if the theme forces
+               // a maximum item number which is lower then the user choice
+               if (($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) {
+                       $itemspage_network = $a->force_max_items;
+               }
+
+               $a->set_pager_itemspage($itemspage_network);
+       }
 
-       $r = community_getitems($a->pager['start'], $a->pager['itemspage']);
+       $r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content);
 
-       if (! DBM::is_result($r)) {
-               info( t('No results.') . EOL);
+       if (!DBM::is_result($r)) {
+               info(t('No results.') . EOL);
                return $o;
        }
 
        $maxpostperauthor = Config::get('system','max_author_posts_community_page');
 
-       if ($maxpostperauthor != 0) {
+       if (($maxpostperauthor != 0) && ($content == 'local')) {
                $count = 1;
                $previousauthor = "";
                $numposts = 0;
@@ -70,53 +129,52 @@ function community_content(App $a, $update = 0) {
                                        $s[] = $item;
                                }
                        }
-                       if ((sizeof($s) < $a->pager['itemspage'])) {
-                               $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
+                       if (sizeof($s) < $a->pager['itemspage']) {
+                               $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content);
                        }
                } while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
        } else {
                $s = $r;
        }
-       // we behave the same in message lists as the search module
 
        $o .= conversation($a, $s, 'community', $update);
 
-       $o .= alt_pager($a, count($r));
+       if (!$update) {
+               $o .= alt_pager($a, count($r));
+       }
 
        $t = get_markup_template("community.tpl");
        return replace_macros($t, array(
                '$content' => $o,
-               '$header' => t("Community"),
-               '$show_global_community_hint' => (Config::get('system', 'community_page_style') == CP_GLOBAL_COMMUNITY && Config::get('system', 'show_global_community_hint')),
+               '$header' => '',
+               '$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),
                '$global_community_hint' => t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.")
        ));
 }
 
-function community_getitems($start, $itemspage) {
-       if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
-               return(community_getpublicitems($start, $itemspage));
+function community_getitems($start, $itemspage, $content) {
+       if ($content == 'local') {
+               $r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
+                       INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
+                       INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
+                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''".
+                       item_joins()." AND `contact`.`self`
+                       WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+                       AND NOT `thread`.`private` AND `thread`.`wall`
+                       ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage)
+               );
+               return dba::inArray($r);
+       } elseif ($content == 'global') {
+               $r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
+                       INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins().
+                       "WHERE `thread`.`uid` = 0 AND `verb` = ?
+                       ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage),
+                       ACTIVITY_POST
+               );
+               return dba::inArray($r);
        }
-       $r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
-               INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
-               INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-               AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-               AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''".
-               item_joins()." AND `contact`.`self`
-               WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-               AND NOT `thread`.`private` AND `thread`.`wall`
-               ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage)
-       );
-
-       return dba::inArray($r);
-}
-
-function community_getpublicitems($start, $itemspage) {
-       $r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
-               INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins().
-               "WHERE `thread`.`uid` = 0 AND `verb` = ?
-               ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage),
-               ACTIVITY_POST
-       );
 
-       return dba::inArray($r);
+       // Should never happen
+       return array();
 }
index ff6c31b6275c16fa5482205d5a1bb00105cf43c5..6c494128b1cd52f718806e35b7e51bd3abc028a4 100644 (file)
@@ -7,23 +7,25 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 
 require_once 'include/items.php';
-require_once 'include/auth.php';
 
 function dfrn_poll_init(App $a)
 {
-       $dfrn_id         = x($_GET,'dfrn_id')         ? $_GET['dfrn_id']              : '';
-       $type            = x($_GET,'type')            ? $_GET['type']                 : 'data';
-       $last_update     = x($_GET,'last_update')     ? $_GET['last_update']          : '';
-       $destination_url = x($_GET,'destination_url') ? $_GET['destination_url']      : '';
-       $challenge       = x($_GET,'challenge')       ? $_GET['challenge']            : '';
-       $sec             = x($_GET,'sec')             ? $_GET['sec']                  : '';
-       $dfrn_version    = x($_GET,'dfrn_version')    ? (float) $_GET['dfrn_version'] : 2.0;
-       $perm            = x($_GET,'perm')            ? $_GET['perm']                 : 'r';
-       $quiet           = x($_GET,'quiet')           ? true                          : false;
+       Login::sessionAuth();
+
+       $dfrn_id         = defaults($_GET, 'dfrn_id'        , '');
+       $type            = defaults($_GET, 'type'           , 'data');
+       $last_update     = defaults($_GET, 'last_update'    , '');
+       $destination_url = defaults($_GET, 'destination_url', '');
+       $challenge       = defaults($_GET, 'challenge'      , '');
+       $sec             = defaults($_GET, 'sec'            , '');
+       $dfrn_version    = (float) defaults($_GET, 'dfrn_version'   , 2.0);
+       $perm            = defaults($_GET, 'perm'           , 'r');
+       $quiet                   = x($_GET, 'quiet');
 
        // Possibly it is an OStatus compatible server that requests a user feed
        if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
index ec675865617b49d2d35f7fa8e0021117a478c16f..ca43998cbce66907ed12ae889c94b24ef70cdbf6 100644 (file)
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file mod/dfrn_request.php
  * @brief Module: dfrn_request
@@ -18,6 +19,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
+use Friendica\Module\Login;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
@@ -31,7 +33,6 @@ function dfrn_request_init(App $a)
        return;
 }
 
-
 /**
  * Function: dfrn_request_post
  *
@@ -47,100 +48,73 @@ function dfrn_request_init(App $a)
  * After logging in, we click 'submit' to approve the linkage.
  *
  */
-function dfrn_request_post(App $a) {
-
-       if(($a->argc != 2) || (! count($a->profile))) {
+function dfrn_request_post(App $a)
+{
+       if (($a->argc != 2) || (!count($a->profile))) {
                logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
                return;
        }
 
-
-       if(x($_POST, 'cancel')) {
+       if (x($_POST, 'cancel')) {
                goaway(System::baseUrl());
        }
 
-
        /*
-        *
         * Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell
         * to confirm the request, and then we've clicked submit (perhaps after logging in).
         * That brings us here:
-        *
         */
-
-       if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) {
-
-               /*
-                * Ensure this is a valid request
-                */
-
-               if(local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST,'dfrn_url'))) {
-
-
-                       $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'] : "");
-                       $hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
+       if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
+               // Ensure this is a valid request
+               if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) {
+                       $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'] : "");
+                       $hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
                        $contact_record = null;
                        $blocked = 1;
                        $pending = 1;
 
-                       if(x($dfrn_url)) {
-
-                               /*
-                                * Lookup the contact based on their URL (which is the only unique thing we have at the moment)
-                                */
-
+                       if (x($dfrn_url)) {
+                               // Lookup the contact based on their URL (which is the only unique thing we have at the moment)
                                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
                                        intval(local_user()),
                                        dbesc(normalise_link($dfrn_url))
                                );
 
                                if (DBM::is_result($r)) {
-                                       if(strlen($r[0]['dfrn-id'])) {
-
-                                               /*
-                                                * We don't need to be here. It has already happened.
-                                                */
-
-                                               notice( t("This introduction has already been accepted.") . EOL );
+                                       if (strlen($r[0]['dfrn-id'])) {
+                                               // We don't need to be here. It has already happened.
+                                               notice(t("This introduction has already been accepted.") . EOL);
                                                return;
-                                       }
-                                       else
+                                       } else {
                                                $contact_record = $r[0];
+                                       }
                                }
 
-                               if(is_array($contact_record)) {
+                               if (is_array($contact_record)) {
                                        $r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d",
                                                intval($aes_allow),
                                                intval($hidden),
                                                intval($contact_record['id'])
                                        );
-                               }
-                               else {
-
-                                       /*
-                                        * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
-                                        */
-
+                               } else {
+                                       // Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
                                        $parms = Probe::profile($dfrn_url);
 
-                                       if (! count($parms)) {
-                                               notice( t('Profile location is not valid or does not contain profile information.') . EOL );
+                                       if (!count($parms)) {
+                                               notice(t('Profile location is not valid or does not contain profile information.') . EOL);
                                                return;
-                                       }
-                                       else {
-                                               if (! x($parms,'fn')) {
-                                                       notice( t('Warning: profile location has no identifiable owner name.') . EOL );
+                                       } else {
+                                               if (!x($parms, 'fn')) {
+                                                       notice(t('Warning: profile location has no identifiable owner name.') . EOL);
                                                }
-                                               if (! x($parms,'photo')) {
-                                                       notice( t('Warning: profile location has no profile photo.') . EOL );
+                                               if (!x($parms, 'photo')) {
+                                                       notice(t('Warning: profile location has no profile photo.') . EOL);
                                                }
                                                $invalid = Probe::validDfrn($parms);
                                                if ($invalid) {
-                                                       notice( sprintf( tt("%d required parameter was not found at the given location",
-                                                                                               "%d required parameters were not found at the given location",
-                                                                                               $invalid), $invalid) . EOL );
+                                                       notice(sprintf(tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
                                                        return;
                                                }
                                        }
@@ -152,10 +126,7 @@ function dfrn_request_post(App $a) {
                                        // Escape the entire array
                                        DBM::esc_array($parms);
 
-                                       /*
-                                        * Create a contact record on our site for the other person
-                                        */
-
+                                       // Create a contact record on our site for the other person
                                        $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
                                                `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
                                                VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
@@ -182,7 +153,7 @@ function dfrn_request_post(App $a) {
                                }
 
                                if ($r) {
-                                       info( t("Introduction complete.") . EOL);
+                                       info(t("Introduction complete.") . EOL);
                                }
 
                                $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
@@ -197,15 +168,12 @@ function dfrn_request_post(App $a) {
                                                Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
                                        }
 
-                                       $forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
+                                       $forwardurl = System::baseUrl() . "/contacts/" . $r[0]['id'];
                                } else {
-                                       $forwardurl = System::baseUrl()."/contacts";
+                                       $forwardurl = System::baseUrl() . "/contacts";
                                }
 
-                               /*
-                                * Allow the blocked remote notification to complete
-                                */
-
+                               // Allow the blocked remote notification to complete
                                if (is_array($contact_record)) {
                                        $dfrn_request = $contact_record['request'];
                                }
@@ -215,18 +183,14 @@ function dfrn_request_post(App $a) {
                                }
 
                                // (ignore reply, nothing we can do it failed)
-
                                // Old: goaway(zrl($dfrn_url));
                                goaway($forwardurl);
                                return; // NOTREACHED
-
                        }
-
                }
 
-               // invalid/bogus request
-
-               notice( t('Unrecoverable protocol error.') . EOL );
+               // invalid/bogus request
+               notice(t('Unrecoverable protocol error.') . EOL);
                goaway(System::baseUrl());
                return; // NOTREACHED
        }
@@ -252,9 +216,8 @@ function dfrn_request_post(App $a) {
         * in $a->argv[1] and we should have their complete info in $a->profile.
         *
         */
-
-       if(! (is_array($a->profile) && count($a->profile))) {
-               notice( t('Profile unavailable.') . EOL);
+       if (!(is_array($a->profile) && count($a->profile))) {
+               notice(t('Profile unavailable.') . EOL);
                return;
        }
 
@@ -268,32 +231,24 @@ function dfrn_request_post(App $a) {
        $blocked = 1;
        $pending = 1;
 
-
-       if( x($_POST,'dfrn_url')) {
-
-               /*
-                * Block friend request spam
-                */
-
-               if($maxreq) {
+       if (x($_POST, 'dfrn_url')) {
+               // Block friend request spam
+               if ($maxreq) {
                        $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
-                               dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
+                               dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours')),
                                intval($uid)
                        );
                        if (DBM::is_result($r) && count($r) > $maxreq) {
-                               notice( sprintf( t('%s has received too many connection requests today.'),  $a->profile['name']) . EOL);
-                               notice( t('Spam protection measures have been invoked.') . EOL);
-                               notice( t('Friends are advised to please try again in 24 hours.') . EOL);
+                               notice(sprintf(t('%s has received too many connection requests today.'), $a->profile['name']) . EOL);
+                               notice(t('Spam protection measures have been invoked.') . EOL);
+                               notice(t('Friends are advised to please try again in 24 hours.') . EOL);
                                return;
                        }
                }
 
-               /*
-                *
-                * Cleanup old introductions that remain blocked.
+               /* 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
@@ -301,7 +256,7 @@ function dfrn_request_post(App $a) {
                );
                if (DBM::is_result($r)) {
                        foreach ($r as $rr) {
-                               if(! $rr['rel']) {
+                               if (!$rr['rel']) {
                                        q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
                                                intval($rr['cid'])
                                        );
@@ -312,11 +267,11 @@ function dfrn_request_post(App $a) {
                        }
                }
 
-               $real_name = (x($_POST,'realname') ? notags(trim($_POST['realname'])) : '');
+               $real_name = x($_POST, 'realname') ? notags(trim($_POST['realname'])) : '';
 
                $url = trim($_POST['dfrn_url']);
-               if(! strlen($url)) {
-                       notice( t("Invalid locator") . EOL );
+               if (!strlen($url)) {
+                       notice(t("Invalid locator") . EOL);
                        return;
                }
 
@@ -327,10 +282,9 @@ function dfrn_request_post(App $a) {
                $network = $data["network"];
 
                // Canonicalise email-style profile locator
-               $url = Probe::webfingerDfrn($url,$hcard);
-
-               if (substr($url,0,5) === 'stat:') {
+               $url = Probe::webfingerDfrn($url, $hcard);
 
+               if (substr($url, 0, 5) === 'stat:') {
                        // Every time we detect the remote subscription we define this as OStatus.
                        // We do this even if it is not OStatus.
                        // we only need to pass this through another section of the code.
@@ -338,29 +292,27 @@ function dfrn_request_post(App $a) {
                                $network = NETWORK_OSTATUS;
                        }
 
-                       $url = substr($url,5);
+                       $url = substr($url, 5);
                } else {
                        $network = NETWORK_DFRN;
                }
 
                logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
 
-               if($network === NETWORK_DFRN) {
+               if ($network === NETWORK_DFRN) {
                        $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
                                intval($uid),
                                dbesc($url)
                        );
 
                        if (DBM::is_result($ret)) {
-                               if(strlen($ret[0]['issued-id'])) {
-                                       notice( t('You have already introduced yourself here.') . EOL );
+                               if (strlen($ret[0]['issued-id'])) {
+                                       notice(t('You have already introduced yourself here.') . EOL);
                                        return;
-                               }
-                               elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) {
-                                       notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
+                               } elseif ($ret[0]['rel'] == CONTACT_IS_FRIEND) {
+                                       notice(sprintf(t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
                                        return;
-                               }
-                               else {
+                               } else {
                                        $contact_record = $ret[0];
                                        $parms = array('dfrn-request' => $ret[0]['request']);
                                }
@@ -368,57 +320,53 @@ function dfrn_request_post(App $a) {
 
                        $issued_id = random_string();
 
-                       if(is_array($contact_record)) {
+                       if (is_array($contact_record)) {
                                // There is a contact record but no issued-id, so this
                                // is a reciprocal introduction from a known contact
                                $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d",
                                        dbesc($issued_id),
                                        intval($contact_record['id'])
                                );
-                       }
-                       else {
-                               if (! validate_url($url)) {
-                                       notice( t('Invalid profile URL.') . EOL);
+                       } else {
+                               $url = validate_url($url);
+                               if (!$url) {
+                                       notice(t('Invalid profile URL.') . EOL);
                                        goaway(System::baseUrl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
-                               if (! allowed_url($url)) {
-                                       notice( t('Disallowed profile URL.') . EOL);
+                               if (!allowed_url($url)) {
+                                       notice(t('Disallowed profile URL.') . EOL);
                                        goaway(System::baseUrl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
                                if (blocked_url($url)) {
-                                       notice( t('Blocked domain') . EOL);
+                                       notice(t('Blocked domain') . EOL);
                                        goaway(System::baseUrl() . '/' . $a->cmd);
                                        return; // NOTREACHED
                                }
 
                                $parms = Probe::profile(($hcard) ? $hcard : $url);
 
-                               if (! count($parms)) {
-                                       notice( t('Profile location is not valid or does not contain profile information.') . EOL );
+                               if (!count($parms)) {
+                                       notice(t('Profile location is not valid or does not contain profile information.') . EOL);
                                        goaway(System::baseUrl() . '/' . $a->cmd);
-                               }
-                               else {
-                                       if (! x($parms,'fn')) {
-                                               notice( t('Warning: profile location has no identifiable owner name.') . EOL );
+                               } else {
+                                       if (!x($parms, 'fn')) {
+                                               notice(t('Warning: profile location has no identifiable owner name.') . EOL);
                                        }
-                                       if (! x($parms,'photo')) {
-                                               notice( t('Warning: profile location has no profile photo.') . EOL );
+                                       if (!x($parms, 'photo')) {
+                                               notice(t('Warning: profile location has no profile photo.') . EOL);
                                        }
                                        $invalid = Probe::validDfrn($parms);
                                        if ($invalid) {
-                                               notice( sprintf( tt("%d required parameter was not found at the given location",
-                                                                                       "%d required parameters were not found at the given location",
-                                                                                       $invalid), $invalid) . EOL );
+                                               notice(sprintf(tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL);
 
                                                return;
                                        }
                                }
 
-
                                $parms['url'] = $url;
                                $parms['issued-id'] = $issued_id;
                                $photo = $parms["photo"];
@@ -460,10 +408,9 @@ function dfrn_request_post(App $a) {
                                                Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
                                        }
                                }
-
                        }
                        if ($r === false) {
-                               notice( t('Failed to update contact record.') . EOL );
+                               notice(t('Failed to update contact record.') . EOL);
                                return;
                        }
 
@@ -482,43 +429,38 @@ function dfrn_request_post(App $a) {
                        }
 
                        // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
-
-                       if (! $failed) {
-                               info( t('Your introduction has been sent.') . EOL );
+                       if (!$failed) {
+                               info(t('Your introduction has been sent.') . EOL);
                        }
 
                        // "Homecoming" - send the requestor back to their site to record the introduction.
-
                        $dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
                        $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
                        goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
                                . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
-                               . '&confirm_key='  . $hash
+                               . '&confirm_key=' . $hash
                                . (($aes_allow) ? "&aes_allow=1" : "")
                        );
                        // NOTREACHED
                        // END $network === NETWORK_DFRN
                } elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
 
-                       /*
-                        *
-                        * Substitute our user's feed URL into $url template
+                       /* Substitute our user's feed URL into $url template
                         * Send the subscriber home to subscribe
-                        *
                         */
-
                        // Diaspora needs the uri in the format user@domain.tld
                        // Diaspora will support the remote subscription in a future version
                        if ($network == NETWORK_DIASPORA) {
-                               $uri = $nickname.'@'.$a->get_hostname();
+                               $uri = $nickname . '@' . $a->get_hostname();
 
-                               if ($a->get_path())
-                                       $uri .= '/'.$a->get_path();
+                               if ($a->get_path()) {
+                                       $uri .= '/' . $a->get_path();
+                               }
 
                                $uri = urlencode($uri);
                        } else {
-                               $uri = System::baseUrl().'/profile/'.$nickname;
+                               $uri = System::baseUrl() . '/profile/' . $nickname;
                        }
 
                        $url = str_replace('{uri}', $uri, $url);
@@ -526,44 +468,37 @@ function dfrn_request_post(App $a) {
                        // NOTREACHED
                        // END $network != NETWORK_PHANTOM
                } else {
-                       notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.").EOL);
+                       notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
                        return;
                }
-
-       }       return;
+       } return;
 }
 
-
-function dfrn_request_content(App $a) {
-
-       if (($a->argc != 2) || (! count($a->profile))) {
+function dfrn_request_content(App $a)
+{
+       if (($a->argc != 2) || (!count($a->profile))) {
                return "";
        }
 
-
        // "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
        // to send us to the post section to record the introduction.
-
-       if (x($_GET,'dfrn_url')) {
-
-               if (! local_user()) {
-                       info( t("Please login to confirm introduction.") . EOL );
+       if (x($_GET, 'dfrn_url')) {
+               if (!local_user()) {
+                       info(t("Please login to confirm introduction.") . EOL);
                        /* setup the return URL to come back to this page if they use openid */
-                       $_SESSION['return_url'] = $a->query_string;
-                       return login();
+                       return Login::form();
                }
 
                // Edge case, but can easily happen in the wild. This person is authenticated,
                // but not as the person who needs to deal with this request.
-
                if ($a->user['nickname'] != $a->argv[1]) {
-                       notice( t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
-                       return login();
+                       notice(t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
+                       return Login::form();
                }
 
                $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
-               $aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0);
-               $confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
+               $aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0;
+               $confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : "";
 
                // Checking fastlane for validity
                if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
@@ -580,34 +515,29 @@ function dfrn_request_content(App $a) {
                }
 
                $tpl = get_markup_template("dfrn_req_confirm.tpl");
-               $o  = replace_macros($tpl,array(
+               $o = replace_macros($tpl, array(
                        '$dfrn_url' => $dfrn_url,
                        '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
                        '$hidethem' => t('Hide this contact'),
                        '$hidechecked' => '',
                        '$confirm_key' => $confirm_key,
-                       '$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']),
-                       '$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
+                       '$welcome' => sprintf(t('Welcome home %s.'), $a->user['username']),
+                       '$please' => sprintf(t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
                        '$submit' => t('Confirm'),
                        '$uid' => $_SESSION['uid'],
                        '$nickname' => $a->user['nickname'],
                        'dfrn_rawurl' => $_GET['dfrn_url']
-                       ));
+               ));
                return $o;
-
-       }
-       elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) {
-
+       } elseif ((x($_GET, 'confirm_key')) && strlen($_GET['confirm_key'])) {
                // we are the requestee and it is now safe to send our user their introduction,
                // We could just unblock it, but first we have to jump through a few hoops to
                // send an email, or even to find out if we need to send an email.
-
                $intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
                        dbesc($_GET['confirm_key'])
                );
 
                if (DBM::is_result($intro)) {
-
                        $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                                WHERE `contact`.`id` = %d LIMIT 1",
                                intval($intro[0]['contact-id'])
@@ -616,11 +546,11 @@ function dfrn_request_content(App $a) {
                        $auto_confirm = false;
 
                        if (DBM::is_result($r)) {
-                               if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
+                               if ($r[0]['page-flags'] != PAGE_NORMAL && $r[0]['page-flags'] != PAGE_PRVGROUP) {
                                        $auto_confirm = true;
+                               }
 
-                               if(! $auto_confirm) {
-
+                               if (!$auto_confirm) {
                                        notification(array(
                                                'type'         => NOTIFY_INTRO,
                                                'notify_flags' => $r[0]['notify-flags'],
@@ -637,7 +567,7 @@ function dfrn_request_content(App $a) {
                                        ));
                                }
 
-                               if($auto_confirm) {
+                               if ($auto_confirm) {
                                        require_once 'mod/dfrn_confirm.php';
                                        $handsfree = array(
                                                'uid'      => $r[0]['uid'],
@@ -645,14 +575,13 @@ function dfrn_request_content(App $a) {
                                                'dfrn_id'  => $r[0]['issued-id'],
                                                'intro_id' => $intro[0]['id'],
                                                'duplex'   => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
-                                               'activity' => intval(PConfig::get($r[0]['uid'],'system','post_newfriend'))
+                                               'activity' => intval(PConfig::get($r[0]['uid'], 'system', 'post_newfriend'))
                                        );
-                                       dfrn_confirm_post($a,$handsfree);
+                                       dfrn_confirm_post($a, $handsfree);
                                }
-
                        }
 
-                       if(! $auto_confirm) {
+                       if (!$auto_confirm) {
 
                                // If we are auto_confirming, this record will have already been nuked
                                // in dfrn_confirm_post()
@@ -665,53 +594,39 @@ function dfrn_request_content(App $a) {
 
                killme();
                return; // NOTREACHED
-       }
-       else {
-
-               /*
-                * Normal web request. Display our user's introduction form.
-                */
-
-               if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
-                       if(! Config::get('system','local_block')) {
-                               notice( t('Public access denied.') . EOL);
+       } else {
+               // Normal web request. Display our user's introduction form.
+               if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
+                       if (!Config::get('system', 'local_block')) {
+                               notice(t('Public access denied.') . EOL);
                                return;
                        }
                }
 
-
-               /*
-                * Try to auto-fill the profile address
-                */
-
+               // Try to auto-fill the profile address
                // At first look if an address was provided
                // Otherwise take the local address
-               if (x($_GET,'addr') && ($_GET['addr'] != "")) {
+               if (x($_GET, 'addr') && ($_GET['addr'] != "")) {
                        $myaddr = hex2bin($_GET['addr']);
-               } elseif (x($_GET,'address') && ($_GET['address'] != "")) {
+               } elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
                        $myaddr = $_GET['address'];
                } elseif (local_user()) {
                        if (strlen($a->path)) {
                                $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
                        } else {
-                               $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
+                               $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
                        }
                } else {
                        // last, try a zrl
                        $myaddr = get_my_url();
                }
 
-               $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
+               $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
-
-               /*
-                *
-                * The auto_request form only has the profile address
+               /* The auto_request form only has the profile address
                 * because nobody is going to read the comments and
                 * it doesn't matter if they know you or not.
-                *
                 */
-
                if ($a->profile['page-flags'] == PAGE_NORMAL) {
                        $tpl = get_markup_template('dfrn_request.tpl');
                } else {
@@ -725,20 +640,17 @@ function dfrn_request_content(App $a) {
                        get_server()
                );
 
-               $o = replace_macros($tpl,array(
+               $o = replace_macros($tpl, array(
                        '$header' => t('Friend/Connection Request'),
                        '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
                        '$pls_answer' => t('Please answer the following:'),
-                       '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))),
-                       /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
-                       '$yes' => t('Yes'),
-                       '$no' => t('No'), */
+                       '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'), $a->profile['name']), false, '', array(t('No'), t('Yes'))),
                        '$add_note' => t('Add a personal note:'),
                        '$page_desc' => $page_desc,
                        '$friendica' => t('Friendica'),
                        '$statusnet' => t('GNU Social (Pleroma, Mastodon)'),
                        '$diaspora' => t('Diaspora (Socialhome, Hubzilla)'),
-                       '$diasnote' => sprintf (t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.'),$target_addr),
+                       '$diasnote' => sprintf(t(' - please do not use this form.  Instead, enter %s into your Diaspora search bar.'), $target_addr),
                        '$your_address' => t('Your Identity Address:'),
                        '$invite_desc' => $invite_desc,
                        '$submit' => t('Submit Request'),
index c124f48bb5e7d58622f1e3bb2fc80452cbf8163b..755c8b922e526f8f69b35150650a6db3d75ce64f 100644 (file)
@@ -5,6 +5,7 @@ use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Group;
 use Friendica\Protocol\DFRN;
 
 function display_init(App $a) {
@@ -271,7 +272,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
        }
 
        if ($contact_id) {
-               $groups = init_groups_visitor($contact_id);
+               $groups = Group::getIdsByContactId($contact_id);
                $r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1",
                        $contact_id,
                        $a->profile['uid']
@@ -312,9 +313,8 @@ function display_content(App $a, $update = false, $update_uid = 0) {
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                );
-               $o .= status_editor($a,$x,0,true);
+               $o .= status_editor($a, $x, 0, true);
        }
 
        $sql_extra = item_permissions_sql($a->profile['uid'], $remote_contact, $groups);
index eb804b5d66c61c98dd0e80380a21e43c130b50ad..0608e8679be8987606666b7d7e03aff5ab9c3adf 100644 (file)
@@ -475,11 +475,6 @@ function events_content(App $a) {
                $fhour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
                $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
 
-               $f = Config::get('system','event_input_format');
-               if (! $f) {
-                       $f = 'ymd';
-               }
-
                require_once 'include/acl_selectors.php' ;
 
                $perms = get_acl_permissions($orig_event);
@@ -511,11 +506,11 @@ function events_content(App $a) {
                        '$title' => t('Event details'),
                        '$desc' => t('Starting date and Title are required.'),
                        '$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
-                       '$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), t('Event Starts:'), 'start_text', true, true, '', '', true),
+                       '$s_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), t('Event Starts:'), 'start_text', true, true, '', '', true),
                        '$n_text' => t('Finish date/time is not known or not relevant'),
                        '$n_checked' => $n_checked,
                        '$f_text' => t('Event Finishes:'),
-                       '$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
+                       '$f_dsel' => datetimesel(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
                        '$a_text' => t('Adjust for viewer timezone'),
                        '$a_checked' => $a_checked,
                        '$d_text' => t('Description:'),
index 985c408b5c098c664e700b6537acaf22b676f11c..5f8d6a64ff9826751d098b2479e0b951cd92c029 100644 (file)
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Module\Login;
 
 if(! function_exists('home_init')) {
 function home_init(App $a) {
@@ -43,8 +44,8 @@ function home_content(App $a) {
                $o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
        }
 
+       $o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
 
-       $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 
        call_hooks("home_content",$o);
 
index 1faef960163c7845bad16b15a814d58a747dd667..16c3ce442a6851b2d9005b8a18130f8276fd2986 100644 (file)
@@ -209,13 +209,13 @@ function item_post(App $a) {
        }
 
        // Allow commenting if it is an answer to a public post
-       $allow_comment = ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA]);
+       $allow_comment = ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
 
        /*
         * Now check that it is a page_type of PAGE_BLOG, and that valid personal details
         * have been provided, and run any anti-spam plugins
         */
-       if (!(can_write_wall($a, $profile_uid) || $allow_comment) && !$allow_moderated) {
+       if (!(can_write_wall($profile_uid) || $allow_comment) && !$allow_moderated) {
                notice(t('Permission denied.') . EOL) ;
                if (x($_REQUEST, 'return')) {
                        goaway($return_path);
diff --git a/mod/login.php b/mod/login.php
deleted file mode 100644 (file)
index f30353e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Core\System;
-
-function login_content(App $a) {
-       if (x($_SESSION, 'theme')) {
-               unset($_SESSION['theme']);
-       }
-
-       if (x($_SESSION, 'mobile-theme')) {
-               unset($_SESSION['mobile-theme']);
-       }
-
-       if (local_user()) {
-               goaway(System::baseUrl());
-       }
-
-       return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
-}
index 81e6754c235595faaef302d12030794c4d463559..f54ee06f0421459b77f1613b7844d77df85d8d94 100644 (file)
@@ -11,6 +11,7 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Module\Login;
 
 require_once 'include/conversation.php';
 require_once 'include/contact_widgets.php';
@@ -380,8 +381,7 @@ function networkConversation($a, $items, $mode, $update) {
 
 function network_content(App $a, $update = 0) {
        if (!local_user()) {
-               $_SESSION['return_url'] = $a->query_string;
-               return login(false);
+               return Login::form();
        }
 
        /// @TODO Is this really necessary? $a is already available to hooks
@@ -454,11 +454,10 @@ function networkFlatView(App $a, $update = 0) {
                        'bang'  => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        'content' => '',
                );
 
-               $o .= status_editor($a,$x);
+               $o .= status_editor($a, $x);
 
                if (!Config::get('theme','hide_eventlist')) {
                        $o .= get_birthdays();
@@ -605,12 +604,10 @@ function networkThreadedView(App $a, $update = 0) {
                        'bang'  => (($group || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
-                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        'content' => $content,
                );
 
-               $o .= status_editor($a,$x);
-
+               $o .= status_editor($a, $x);
        }
 
        // We don't have to deal with ACLs on this page. You're looking at everything
index fae7ebb39b921cb7a29a4d603b749ca2ae5e8364..913f83f9beef777ef70277b7834ceec5ba78feea 100644 (file)
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Module\Login;
 
 function notify_init(App $a) {
        if (! local_user()) {
@@ -45,7 +46,7 @@ function notify_init(App $a) {
 
 function notify_content(App $a) {
        if (! local_user()) {
-               return login();
+               return Login::form();
        }
 
        $nm = new NotificationsManager();
index 88edc9d60c17e097e16ba2141cfa0d5920476ffa..37dc76545f73522213c3483540840c1b748fe1f2 100644 (file)
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Module\Login;
 
 function oexchange_init(App $a) {
 
@@ -17,7 +18,7 @@ function oexchange_init(App $a) {
 function oexchange_content(App $a) {
 
        if (! local_user()) {
-               $o = login(false);
+               $o = Login::form();
                return $o;
        }
 
index c7021aa44772b63b10151dfdcf40a9f392711ba0..ab0ad75013c24f03678dc2e63730f2725b1cd48a 100644 (file)
@@ -9,6 +9,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Group;
 use Friendica\Model\Photo;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
@@ -1045,7 +1046,7 @@ function photos_content(App $a)
                        }
                }
                if ($contact_id) {
-                       $groups = init_groups_visitor($contact_id);
+                       $groups = Group::getIdsByContactId($contact_id);
                        $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
                                intval($contact_id),
                                intval($owner_uid)
@@ -1133,7 +1134,6 @@ function photos_content(App $a)
                        '$uploadurl' => $ret['post_url'],
 
                        // ACL permissions box
-                       '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                        '$group_perms' => t('Show to Groups'),
                        '$contact_perms' => t('Show to Contacts'),
                        '$return_path' => $a->query_string,
@@ -1481,7 +1481,6 @@ function photos_content(App $a)
                                '$delete' => t('Delete Photo'),
 
                                // ACL permissions box
-                               '$acl_data' => construct_acl_data($a, $ph[0]), // For non-Javascript ACL selector
                                '$group_perms' => t('Show to Groups'),
                                '$contact_perms' => t('Show to Contacts'),
                                '$return_path' => $a->query_string,
@@ -1500,7 +1499,7 @@ function photos_content(App $a)
                        $tpl = get_markup_template('photo_item.tpl');
                        $return_url = $a->cmd;
 
-                       if ($can_post || can_write_wall($a, $owner_uid)) {
+                       if ($can_post || can_write_wall($owner_uid)) {
                                $like_tpl = get_markup_template('like_noshare.tpl');
                                $likebuttons = replace_macros($like_tpl, array(
                                        '$id' => $link_item['id'],
@@ -1512,7 +1511,7 @@ function photos_content(App $a)
                        }
 
                        if (!DBM::is_result($r)) {
-                               if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
+                               if (($can_post || can_write_wall($owner_uid)) && $link_item['last-child']) {
                                        $comments .= replace_macros($cmnt_tpl, array(
                                                '$return_path' => '',
                                                '$jsreload' => $return_url,
@@ -1551,7 +1550,7 @@ function photos_content(App $a)
                                        $dislike = format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike', $link_item['id']);
                                }
 
-                               if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
+                               if (($can_post || can_write_wall($owner_uid)) && $link_item['last-child']) {
                                        $comments .= replace_macros($cmnt_tpl,array(
                                                '$return_path' => '',
                                                '$jsreload' => $return_url,
@@ -1624,7 +1623,7 @@ function photos_content(App $a)
                                                '$comment' => $comment
                                        ));
 
-                                       if (($can_post || can_write_wall($a, $owner_uid)) && $item['last-child']) {
+                                       if (($can_post || can_write_wall($owner_uid)) && $item['last-child']) {
                                                $comments .= replace_macros($cmnt_tpl, array(
                                                        '$return_path' => '',
                                                        '$jsreload' => $return_url,
index de0e345573dbdbbd3a0b4aaff518b7a579bc1cda..ce2c5348d92dfae3c88347619de246153a9cb336 100644 (file)
@@ -5,6 +5,8 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Group;
+use Friendica\Module\Login;
 
 require_once 'include/contact_widgets.php';
 require_once 'include/redir.php';
@@ -103,7 +105,7 @@ function profile_content(App $a, $update = 0)
        $hashtags = defaults($_GET, 'tag', '');
 
        if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
-               return login();
+               return Login::form();
        }
 
        require_once 'include/bbcode.php';
@@ -139,7 +141,7 @@ function profile_content(App $a, $update = 0)
        }
 
        if ($contact_id) {
-               $groups = init_groups_visitor($contact_id);
+               $groups = Group::getIdsByContactId($contact_id);
                $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($contact_id),
                        intval($a->profile['profile_uid'])
@@ -192,7 +194,7 @@ function profile_content(App $a, $update = 0)
                $a->page['aside'] .= categories_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (x($category) ? xmlify($category) : ''));
                $a->page['aside'] .= tagcloud_wall_widget();
 
-               if (can_write_wall($a, $a->profile['profile_uid'])) {
+               if (can_write_wall($a->profile['profile_uid'])) {
                        $x = array(
                                'is_owner' => $is_owner,
                                'allow_location' => ($is_owner || $commvisitor) && $a->profile['allow_location'],
@@ -208,7 +210,6 @@ function profile_content(App $a, $update = 0)
                                'bang' => '',
                                'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                'profile_uid' => $a->profile['profile_uid'],
-                               'acl_data' => $is_owner ? construct_acl_data($a, $a->user) : '', // For non-Javascript ACL selector
                        );
 
                        $o .= status_editor($a, $x);
index 893f0d51e34ba35cdd2e2271a93df29fffb383fc..cc01f74dd884799f7f7423715d0f268259ae4601 100644 (file)
@@ -655,11 +655,6 @@ function profiles_content(App $a) {
 
                $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
-               $f = Config::get('system', 'birthday_input_format');
-               if (! $f) {
-                       $f = 'ymd';
-               }
-
                $is_default = (($r[0]['is-default']) ? 1 : 0);
                $tpl = get_markup_template("profile_edit.tpl");
                $o .= replace_macros($tpl, array(
index d4908b210f113346420f5ce4212be4c1a438def3..8f08067e21115b70831a36982034ae4f0c2b9d88 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\User;
+use Friendica\Module\Login;
 
 require_once 'include/enotify.php';
 
@@ -94,11 +95,9 @@ function regmod_content(App $a)
 {
        global $lang;
 
-       $_SESSION['return_url'] = $a->cmd;
-
        if (!local_user()) {
                info(t('Please login.') . EOL);
-               $o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+               $o .= '<br /><br />' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
                return $o;
        }
 
index e3d650e089de6d10fa0f54d2dbca23353b9a2cbf..5a430e39d15b8e1643009deda7d1cca5f46199f1 100644 (file)
@@ -537,10 +537,9 @@ function settings_post(App $a) {
        // If openid has changed or if there's an openid but no openidserver, try and discover it.
 
        if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
-               $tmp_str = $openid;
-               if (strlen($tmp_str) && validate_url($tmp_str)) {
+               if (strlen($tmp_str) && validate_url($openid)) {
                        logger('updating openidserver');
-                       require_once('library/openid.php');
+                       require_once 'library/openid.php';
                        $open_id_obj = new LightOpenID;
                        $open_id_obj->identity = $openid;
                        $openidserver = $open_id_obj->discover($open_id_obj->identity);
@@ -1281,7 +1280,6 @@ function settings_content(App $a) {
                '$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
 
                // ACL permissions box
-               '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                '$group_perms' => t('Show to Groups'),
                '$contact_perms' => t('Show to Contacts'),
                '$private' => t('Default Private Post'),
index a597b169872feb63a144aa5def4ae12d333ad2ac..9200c335e1b7b457eefe2441629691fc617d15b8 100644 (file)
@@ -32,7 +32,7 @@ function subthread_content(App $a) {
 
        $owner_uid = $item['uid'];
 
-       if(! can_write_wall($a,$owner_uid)) {
+       if(! can_write_wall($owner_uid)) {
                return;
        }
 
index c0e4c33238211f0f85311fc94c1a0627898d0446..037c724891cdb8eb637667faabac28d7d727a7a1 100644 (file)
@@ -8,12 +8,16 @@ use Friendica\Core\PConfig;
 require_once("mod/community.php");
 
 function update_community_content(App $a) {
-
        header("Content-type: text/html");
        echo "<!DOCTYPE html><html><body>\r\n";
        echo "<section>";
 
-       $text = community_content($a, true);
+       if ($_GET["force"] == 1) {
+               $text = community_content($a, true);
+       } else {
+               $text = '';
+       }
+
        $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
        $replace = "<img\${1} dst=\"\${2}\"";
        $text = preg_replace($pattern, $replace, $text);
@@ -34,4 +38,4 @@ function update_community_content(App $a) {
        echo "</section>";
        echo "</body></html>\r\n";
        killme();
-}
\ No newline at end of file
+}
index c4e5d0aaa410882caf4eb97430cf310c3fe60948..a7759f7419eb288a0ff8a1ae498ac091bb843e54 100644 (file)
@@ -6,6 +6,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Group;
 
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
@@ -294,7 +295,7 @@ function videos_content(App $a) {
                        }
                }
                if($contact_id) {
-                       $groups = init_groups_visitor($contact_id);
+                       $groups = Group::getIdsByContactId($contact_id);
                        $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
                                intval($contact_id),
                                intval($owner_uid)
index 01957164c10bd664fbd536b2f6c0680b5af8e9c9..5adfe096d7dac1df67b1c1b481e1cb90e8071533 100644 (file)
@@ -20,7 +20,7 @@ class BaseObject
         *
         * Same as get_app from boot.php
         *
-        * @return object
+        * @return App
         */
        public static function getApp()
        {
index 1c4d8633065178aa0037112f70c99df0405a4ced..4ec5b2ad352480fe259757a9e8f84f467f8413ff 100644 (file)
@@ -4,7 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\App;
+use Friendica\BaseObject;
 
 /**
  * @file include/Core/System.php
@@ -16,23 +16,8 @@ use Friendica\App;
 /**
  * @brief System methods
  */
-class System
+class System extends BaseObject
 {
-       private static $a;
-
-       /**
-        * @brief Initializes the static class variable
-        * @return void
-        */
-       private static function init()
-       {
-               global $a;
-
-               if (!is_object(self::$a)) {
-                       self::$a = $a;
-               }
-       }
-
        /**
         * @brief Retrieves the Friendica instance base URL
         *
@@ -41,8 +26,7 @@ class System
         */
        public static function baseUrl($ssl = false)
        {
-               self::init();
-               return self::$a->get_baseurl($ssl);
+               return self::getApp()->get_baseurl($ssl);
        }
 
        /**
@@ -54,8 +38,7 @@ class System
         */
        public static function removedBaseUrl($orig_url)
        {
-               self::init();
-               return self::$a->remove_baseurl($orig_url);
+               return self::getApp()->remove_baseurl($orig_url);
        }
 
        /**
index a23b417cc933dd5ff9004d654f3e1c1c95c20b79..db9ec331e46f34bede096b71443e5fc0a69f6836 100644 (file)
@@ -61,7 +61,7 @@ class Group extends BaseObject
         * @param int $cid
         * @return array
         */
-       private static function getIdsByContactId($cid)
+       public static function getIdsByContactId($cid)
        {
                $condition = ['contact-id' => $cid];
                $stmt = dba::select('group_member', ['gid'], $condition);
index 4f294f6e8939eed672d4f03c7b15fe9f5bc66bef..c6d6c044d5ca65ccbb0dfb85d26cd52ccb0f9e21 100644 (file)
@@ -198,8 +198,6 @@ class User
                        $password = $password1;
                }
 
-               $tmp_str = $openid_url;
-
                if ($using_invites) {
                        if (!$invite_id) {
                                throw new Exception(t('An invitation is required.'));
@@ -212,7 +210,7 @@ class User
 
                if (!x($username) || !x($email) || !x($nickname)) {
                        if ($openid_url) {
-                               if (!validate_url($tmp_str)) {
+                               if (!validate_url($openid_url)) {
                                        throw new Exception(t('Invalid OpenID url'));
                                }
                                $_SESSION['register'] = 1;
@@ -235,7 +233,7 @@ class User
                        throw new Exception(t('Please enter the required information.'));
                }
 
-               if (!validate_url($tmp_str)) {
+               if (!validate_url($openid_url)) {
                        $openid_url = '';
                }
 
diff --git a/src/Module/Login.php b/src/Module/Login.php
new file mode 100644 (file)
index 0000000..b90ba9d
--- /dev/null
@@ -0,0 +1,311 @@
+<?php\r
+\r
+namespace Friendica\Module;\r
+\r
+use Friendica\BaseModule;\r
+use Friendica\Core\Config;\r
+use Friendica\Database\DBM;\r
+use Friendica\Model\User;\r
+use dba;\r
+\r
+require_once 'boot.php';\r
+require_once 'include/datetime.php';\r
+require_once 'include/pgettext.php';\r
+require_once 'include/security.php';\r
+require_once 'include/text.php';\r
+\r
+/**\r
+ * Login module\r
+ *\r
+ * @author Hypolite Petovan mrpetovan@gmail.com\r
+ */\r
+class Login extends BaseModule\r
+{\r
+       public static function content()\r
+       {\r
+               $a = self::getApp();\r
+\r
+               if (x($_SESSION, 'theme')) {\r
+                       unset($_SESSION['theme']);\r
+               }\r
+\r
+               if (x($_SESSION, 'mobile-theme')) {\r
+                       unset($_SESSION['mobile-theme']);\r
+               }\r
+\r
+               if (local_user()) {\r
+                       goaway(self::getApp()->get_baseurl());\r
+               }\r
+\r
+               return self::form(self::getApp()->get_baseurl(), $a->config['register_policy'] != REGISTER_CLOSED);\r
+       }\r
+\r
+       public static function post()\r
+       {\r
+               session_unset();\r
+               // OpenId Login\r
+               if (\r
+                       !x($_POST, 'password')\r
+                       && (\r
+                               x($_POST, 'openid_url')\r
+                               || x($_POST, 'username')\r
+                       )\r
+               ) {\r
+                       $noid = Config::get('system', 'no_openid');\r
+\r
+                       $openid_url = trim($_POST['openid_url'] ? : $_POST['username']);\r
+\r
+                       // if it's an email address or doesn't resolve to a URL, fail.\r
+                       if ($noid || strpos($openid_url, '@') || !validate_url($openid_url)) {\r
+                               notice(t('Login failed.') . EOL);\r
+                               goaway(self::getApp()->get_baseurl());\r
+                               // NOTREACHED\r
+                       }\r
+\r
+                       // Otherwise it's probably an openid.\r
+                       try {\r
+                               require_once 'library/openid.php';\r
+                               $openid = new LightOpenID;\r
+                               $openid->identity = $openid_url;\r
+                               $_SESSION['openid'] = $openid_url;\r
+                               $_SESSION['remember'] = $_POST['remember'];\r
+                               $openid->returnUrl = self::getApp()->get_baseurl(true) . '/openid';\r
+                               goaway($openid->authUrl());\r
+                       } catch (Exception $e) {\r
+                               notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . '<br /><br >' . t('The error message was:') . ' ' . $e->getMessage());\r
+                       }\r
+                       // NOTREACHED\r
+               }\r
+\r
+               if (x($_POST, 'auth-params') && $_POST['auth-params'] === 'login') {\r
+                       $record = null;\r
+\r
+                       $addon_auth = array(\r
+                               'username' => trim($_POST['username']),\r
+                               'password' => trim($_POST['password']),\r
+                               'authenticated' => 0,\r
+                               'user_record' => null\r
+                       );\r
+\r
+                       /*\r
+                        * A plugin indicates successful login by setting 'authenticated' to non-zero value and returning a user record\r
+                        * Plugins should never set 'authenticated' except to indicate success - as hooks may be chained\r
+                        * and later plugins should not interfere with an earlier one that succeeded.\r
+                        */\r
+                       call_hooks('authenticate', $addon_auth);\r
+\r
+                       if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) {\r
+                               $record = $addon_auth['user_record'];\r
+                       } else {\r
+                               $user_id = User::authenticate(trim($_POST['username']), trim($_POST['password']));\r
+                               if ($user_id) {\r
+                                       $record = dba::select('user', [], ['uid' => $user_id], ['limit' => 1]);\r
+                               }\r
+                       }\r
+\r
+                       if (!$record || !count($record)) {\r
+                               logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);\r
+                               notice(t('Login failed.') . EOL);\r
+                               goaway(self::getApp()->get_baseurl());\r
+                       }\r
+\r
+                       if (!$_POST['remember']) {\r
+                               new_cookie(0); // 0 means delete on browser exit\r
+                       }\r
+\r
+                       // if we haven't failed up this point, log them in.\r
+                       $_SESSION['remember'] = $_POST['remember'];\r
+                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');\r
+                       authenticate_success($record, true, true);\r
+\r
+                       if (x($_SESSION, 'return_url')) {\r
+                               $return_url = $_SESSION['return_url'];\r
+                               unset($_SESSION['return_url']);\r
+                       } else {\r
+                               $return_url = '';\r
+                       }\r
+\r
+                       goaway($return_url);\r
+               }\r
+       }\r
+\r
+       /**\r
+        * @brief Tries to auth the user from the cookie or session\r
+        *\r
+        * @todo Should be moved to Friendica\Core\Session when it's created\r
+        */\r
+       public static function sessionAuth()\r
+       {\r
+               // When the "Friendica" cookie is set, take the value to authenticate and renew the cookie.\r
+               if (isset($_COOKIE["Friendica"])) {\r
+                       $data = json_decode($_COOKIE["Friendica"]);\r
+                       if (isset($data->uid)) {\r
+\r
+                               $user = dba::select('user',\r
+                                       [],\r
+                                       [\r
+                                               'uid'             => $data->uid,\r
+                                               'blocked'         => false,\r
+                                               'account_expired' => false,\r
+                                               'account_removed' => false,\r
+                                               'verified'        => true,\r
+                                       ],\r
+                                       ['limit' => 1]\r
+                               );\r
+\r
+                               if (DBM::is_result($user)) {\r
+                                       if ($data->hash != cookie_hash($user)) {\r
+                                               logger("Hash for user " . $data->uid . " doesn't fit.");\r
+                                               nuke_session();\r
+                                               goaway(self::getApp()->get_baseurl());\r
+                                       }\r
+\r
+                                       // Renew the cookie\r
+                                       // Expires after 7 days by default,\r
+                                       // can be set via system.auth_cookie_lifetime\r
+                                       $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);\r
+                                       new_cookie($authcookiedays * 24 * 60 * 60, $user);\r
+\r
+                                       // Do the authentification if not done by now\r
+                                       if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {\r
+                                               authenticate_success($user);\r
+\r
+                                               if (Config::get('system', 'paranoia')) {\r
+                                                       $_SESSION['addr'] = $data->ip;\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
+               }\r
+\r
+               if (isset($_SESSION) && x($_SESSION, 'authenticated')) {\r
+                       if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {\r
+                               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",\r
+                                       intval($_SESSION['visitor_id'])\r
+                               );\r
+                               if (DBM::is_result($r)) {\r
+                                       $a->contact = $r[0];\r
+                               }\r
+                       }\r
+\r
+                       if (x($_SESSION, 'uid')) {\r
+                               // already logged in user returning\r
+                               $check = Config::get('system', 'paranoia');\r
+                               // extra paranoia - if the IP changed, log them out\r
+                               if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {\r
+                                       logger('Session address changed. Paranoid setting in effect, blocking session. ' .\r
+                                               $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);\r
+                                       nuke_session();\r
+                                       goaway(self::getApp()->get_baseurl());\r
+                               }\r
+\r
+                               $user = dba::select('user',\r
+                                       [],\r
+                                       [\r
+                                               'uid'             => $_SESSION['uid'],\r
+                                               'blocked'         => false,\r
+                                               'account_expired' => false,\r
+                                               'account_removed' => false,\r
+                                               'verified'        => true,\r
+                                       ],\r
+                                       ['limit' => 1]\r
+                               );\r
+                               if (!DBM::is_result($user)) {\r
+                                       nuke_session();\r
+                                       goaway(self::getApp()->get_baseurl());\r
+                               }\r
+\r
+                               // Make sure to refresh the last login time for the user if the user\r
+                               // stays logged in for a long time, e.g. with "Remember Me"\r
+                               $login_refresh = false;\r
+                               if (!x($_SESSION['last_login_date'])) {\r
+                                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');\r
+                               }\r
+                               if (strcmp(datetime_convert('UTC', 'UTC', 'now - 12 hours'), $_SESSION['last_login_date']) > 0) {\r
+                                       $_SESSION['last_login_date'] = datetime_convert('UTC', 'UTC');\r
+                                       $login_refresh = true;\r
+                               }\r
+                               authenticate_success($user, false, false, $login_refresh);\r
+                       }\r
+               }\r
+       }\r
+\r
+       /**\r
+        * @brief Wrapper for adding a login box.\r
+        *\r
+        * @param string $return_url The url relative to the base the user should be sent\r
+        *                                                       back to after login completes\r
+        * @param bool $register If $register == true provide a registration link.\r
+        *                                               This will most always depend on the value of $a->config['register_policy'].\r
+        * @param array $hiddens  optional\r
+        *\r
+        * @return string Returns the complete html for inserting into the page\r
+        *\r
+        * @hooks 'login_hook' string $o\r
+        */\r
+       public static function form($return_url = null, $register = false, $hiddens = [])\r
+       {\r
+               $a = self::getApp();\r
+               $o = '';\r
+               $reg = false;\r
+               if ($register) {\r
+                       $reg = array(\r
+                               'title' => t('Create a New Account'),\r
+                               'desc' => t('Register')\r
+                       );\r
+               }\r
+\r
+               $noid = Config::get('system', 'no_openid');\r
+\r
+               if (is_null($return_url)) {\r
+                       $return_url = $a->query_string;\r
+               }\r
+\r
+               if (local_user()) {\r
+                       $tpl = get_markup_template('logout.tpl');\r
+               } else {\r
+                       $a->page['htmlhead'] .= replace_macros(\r
+                               get_markup_template('login_head.tpl'),\r
+                               [\r
+                                       '$baseurl' => $a->get_baseurl(true)\r
+                               ]\r
+                       );\r
+\r
+                       $tpl = get_markup_template('login.tpl');\r
+                       $_SESSION['return_url'] = $return_url;\r
+               }\r
+\r
+               $o .= replace_macros(\r
+                       $tpl,\r
+                       [\r
+                               '$dest_url'     => self::getApp()->get_baseurl(true) . '/login',\r
+                               '$logout'       => t('Logout'),\r
+                               '$login'        => t('Login'),\r
+\r
+                               '$lname'        => array('username', t('Nickname or Email: ') , '', ''),\r
+                               '$lpassword'    => array('password', t('Password: '), '', ''),\r
+                               '$lremember'    => array('remember', t('Remember me'), 0,  ''),\r
+\r
+                               '$openid'       => !$noid,\r
+                               '$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),\r
+\r
+                               '$hiddens'      => $hiddens,\r
+\r
+                               '$register'     => $reg,\r
+\r
+                               '$lostpass'     => t('Forgot your password?'),\r
+                               '$lostlink'     => t('Password Reset'),\r
+\r
+                               '$tostitle'     => t('Website Terms of Service'),\r
+                               '$toslink'      => t('terms of service'),\r
+\r
+                               '$privacytitle' => t('Website Privacy Policy'),\r
+                               '$privacylink'  => t('privacy policy'),\r
+                       ]\r
+               );\r
+\r
+               call_hooks('login_hook', $o);\r
+\r
+               return $o;\r
+       }\r
+}\r
diff --git a/src/Module/Logout.php b/src/Module/Logout.php
new file mode 100644 (file)
index 0000000..0c8a617
--- /dev/null
@@ -0,0 +1,29 @@
+<?php\r
+\r
+namespace Friendica\Module;\r
+\r
+use Friendica\BaseModule;\r
+\r
+require_once 'boot.php';\r
+require_once 'include/pgettext.php';\r
+require_once 'include/plugin.php';\r
+require_once 'include/security.php';\r
+\r
+/**\r
+ * Logout module\r
+ *\r
+ * @author Hypolite Petovan mrpetovan@gmail.com\r
+ */\r
+class Logout extends BaseModule\r
+{\r
+       /**\r
+        * @brief Process logout requests\r
+        */\r
+       public static function init()\r
+       {\r
+               call_hooks("logging_out");\r
+               nuke_session();\r
+               info(t('Logged out.') . EOL);\r
+               goaway(self::getApp()->get_baseurl());\r
+       }\r
+}\r
index dd32fc3e3ee18ccff7d41573a611f9fb3f7b1fa6..7ffbe6e726f8236162ed671ca564331cbb949364 100644 (file)
@@ -285,6 +285,12 @@ class Post extends BaseObject
                        if ($shareable) {
                                $buttons['share'] = array(t('Share this'), t('share'));
                        }
+
+                       // If a contact isn't writable, we cannot send a like or dislike to it
+                       if (!$item['writable']) {
+                               unset($buttons["like"]);
+                               unset($buttons["dislike"]);
+                       }
                }
 
                $comment = $this->getCommentBox($indent);
index 2872fe4a024ae6e5aafca808d3d4f111abde89bd..534095efbb3a745cb9773bca013c7ee310016d6a 100644 (file)
@@ -60,11 +60,15 @@ class Thread extends BaseObject
                                break;
                        case 'profile':
                                $this->profile_owner = $a->profile['profile_uid'];
-                               $this->writable = can_write_wall($a, $this->profile_owner);
+                               $this->writable = can_write_wall($this->profile_owner);
                                break;
                        case 'display':
                                $this->profile_owner = $a->profile['uid'];
-                               $this->writable = can_write_wall($a, $this->profile_owner) || $writable;
+                               $this->writable = can_write_wall($this->profile_owner) || $writable;
+                               break;
+                       case 'community':
+                               $this->profile_owner = local_user();
+                               $this->writable = $writable;
                                break;
                        default:
                                logger('[ERROR] Conversation::setMode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
index 752921424c008003d78a14361671836de0f09881..4d63f2b0bb531ff343d7bc21a666117b5d4ea399 100644 (file)
@@ -15,6 +15,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Object\Image;
@@ -167,7 +168,7 @@ class DFRN
 
                        $contact = $r[0];
                        include_once 'include/security.php';
-                       $groups = init_groups_visitor($contact['id']);
+                       $groups = Group::getIdsByContactId($contact['id']);
 
                        if (count($groups)) {
                                for ($x = 0; $x < count($groups); $x ++)
index 59ca2757f367ddfae9235bd954f11060304454a1..6b5f5d5769aa0d4421e67f1d79525effab1a8d56 100644 (file)
@@ -3114,7 +3114,15 @@ class Diaspora
                }
 
                $logid = random_string(4);
-               $dest_url = (($public_batch) ? $contact["batch"] : $contact["notify"]);
+               $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
+
+               // Fetch the fcontact entry when there is missing data
+               // Will possibly happen when data is transmitted to a DFRN contact
+               if (empty($dest_url) && !empty($contact['addr'])) {
+                       $fcontact = self::personByHandle($contact['addr']);
+                       $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
+               }
+
                if (!$dest_url) {
                        logger("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
                        return 0;
index 192c5e815dd2aebd4e805fb599bb89bb750eee7a..fc7f884f6ab6fa9b8bd36cb942704864511b4773 100644 (file)
@@ -217,9 +217,14 @@ class Delivery {
                }
                $deliver_status = 0;
 
+               // Transmit via Diaspora if not possible via Friendica
+               if (($item['uid'] == 0) && ($contact['network'] == NETWORK_DFRN)) {
+                       $contact['network'] = NETWORK_DIASPORA;
+               }
+
                logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']);
 
-               switch($contact['network']) {
+               switch ($contact['network']) {
 
                        case NETWORK_DFRN:
                                logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
index ee7102992917f1689cde5d863e6caabdfbfe9c54..768dd122f955b890cea575219bcd30ad81cc52a6 100644 (file)
 ?>
 <!DOCTYPE html >
 <?php
-       use Friendica\Core\Config;
-       use Friendica\Core\PConfig;
-       use Friendica\Core\System;
-       require_once('view/theme/frio/php/frio_boot.php');
+
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+
+require_once 'view/theme/frio/php/frio_boot.php';
 
 //     $minimal = is_modal();
-       if (!isset($minimal)) {
-               $minimal = false;
-       }
+if (!isset($minimal)) {
+       $minimal = false;
+}
 ?>
 <html>
-<head>
-       <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-       <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
-       <script  type="text/javascript">var baseurl="<?php echo System::baseUrl() ?>";</script>
-       <script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
-       <?php $baseurl = System::baseUrl(); ?>
-       <?php $frio = "view/theme/frio"; ?>
-       <?php
-               // Because we use minimal for modals the header and the included js stuff should be only loaded
-               // if the page is an standard page (so we don't have it twice for modals)
-               //
-               /// @todo Think about to move js stuff in the footer
-               if(!$minimal) {
-                       if(x($page,'htmlhead')) echo $page['htmlhead'];
-               }
-       ?>
-       <?php
-               // Add the theme color meta
-               // It makes mobile Chrome UI match Frio's top bar color.
-               $uid = $a->profile_uid;
-               if (is_null($uid)) {
-                       $uid = get_theme_uid();
-               }
-               $schema = PConfig::get($uid, 'frio', 'schema');
-               if (($schema) && ($schema != '---')) {
-                       if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
-                               $schemefile = 'view/theme/frio/schema/'.$schema.'.php';
-                               require_once($schemefile);
-                       }
-               } else {
-                       $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
-               }
-               if (!$nav_bg) {
-                       $nav_bg = "#708fa0";
-               }
-               echo '<meta name="theme-color" content="'.$nav_bg.'" />';
-       ?>
-
-</head>
+       <head>
+               <title><?php if (x($page, 'title')) echo $page['title'] ?></title>
+               <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
+               <script  type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
+               <script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
 <?php
-if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login"))
-{
-       echo"<body id=\"top\">";
-}
-else
-{
-       echo"<body id=\"top\">";
-}
+       $baseurl = System::baseUrl();
+       $frio = "view/theme/frio";
+       // Because we use minimal for modals the header and the included js stuff should be only loaded
+       // if the page is an standard page (so we don't have it twice for modals)
+       //
+       /// @todo Think about to move js stuff in the footer
+       if (!$minimal && x($page, 'htmlhead')) {
+               echo $page['htmlhead'];
+       }
+       // Add the theme color meta
+       // It makes mobile Chrome UI match Frio's top bar color.
+       $uid = $a->profile_uid;
+       if (is_null($uid)) {
+               $uid = get_theme_uid();
+       }
+       $schema = PConfig::get($uid, 'frio', 'schema');
+       if (($schema) && ($schema != '---')) {
+               if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
+                       $schemefile = 'view/theme/frio/schema/' . $schema . '.php';
+                       require_once $schemefile;
+               }
+       } else {
+               $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
+       }
+       if (!$nav_bg) {
+               $nav_bg = "#708fa0";
+       }
+       echo '
+               <meta name="theme-color" content="' . $nav_bg . '" />';
 ?>
-<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+       </head>
+       <body id="top">
+               <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
 <?php
-       if(x($page,'nav') && (!$minimal)){
-       echo    str_replace("~config.sitename~",Config::get('config','sitename'),
-                       str_replace("~system.banner~",Config::get('system','banner'),
-                       $page['nav']
-       ));};
+       if (x($page, 'nav') && !$minimal) {
+               echo str_replace(
+                       "~config.sitename~",
+                       Config::get('config', 'sitename'),
+                       str_replace(
+                               "~system.banner~",
+                               Config::get('system', 'banner'),
+                               $page['nav']
+                       )
+               );
+       };
 
        // special minimal style for modal dialogs
-       if($minimal) {
+       if ($minimal) {
 ?>
-               <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
+               <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;">
+                       <?php if (x($page, 'content')) echo $page['content']; ?>
                        <div id="page-footer"></div>
                </section>
-<?php  }
-       // the style for all other pages
-       else {
-?>     <main>
-               <div class="container">
-                       <div class="row">
 <?php
-                               if(($_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/"))
-                               {
-                                       echo"
-                                       <aside class=\"col-lg-3 col-md-3 offcanvas-sm offcanvas-xs\">
-                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+       } else {
+               // the style for all other pages
+?>
+               <main>
+                       <div class="container">
+                               <div class="row">
+<?php
+                                       if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) {
+                                               echo '
+                                       <aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
+
+                                               if (x($page, 'aside')) {
+                                                       echo $page['aside'];
+                                               }
+
+                                               if (x($page, 'right_aside')) {
+                                                       echo $page['right_aside'];
+                                               }
+
+                                               echo '
                                        </aside>
 
-                                       <div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\">
-                                               <section class=\"sectiontop "; echo $a->argv[0]; echo "-content-wrapper\">";
-                                                               if(x($page,'content')) echo $page['content']; echo"
-                                                               <div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
+                                       <div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
+                                               <section class="sectiontop ';
+                                               echo $a->argv[0];
+                                               echo '-content-wrapper">';
+                                               if (x($page, 'content')) {
+                                                       echo $page['content'];
+                                               }
+                                               echo '
+                                                               <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
                                                </section>
                                        </div>
-                                               ";
-                               }
-                               else
-                               {
-                                       echo"
-                                       <div class=\"col-lg-12 col-md-12 col-sm-12 col-xs-12\" id=\"content\" style=\"margin-top:50px;\" >
-                                               "; if(x($page,'content')) echo $page['content']; echo"
+                                               ';
+                                       } else {
+                                               echo '
+                                       <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
+                                               if (x($page, 'content')) {
+                                                       echo $page['content'];
+                                               }
+                                               echo '
                                        </div>
-                                       ";
-                               }
+                                       ';
+                                       }
 ?>
-                       </div><!--row-->
-               </div><!-- container -->
+                               </div><!--row-->
+                       </div><!-- container -->
 
-               <div id="back-to-top" title="back to top">&#8679;</div>
-       </main>
+                       <div id="back-to-top" title="back to top">&#8679;</div>
+               </main>
 
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-<!-- Modal  -->
-<div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
-       <div class="modal-dialog modal-full-screen">
-               <div class="modal-content">
-                       <div id="modal-header" class="modal-header">
-                               <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                                       &times;
-                               </button>
-                               <h4 id="modal-title" class="modal-title"></h4>
-                       </div>
-                       <div id="modal-body" class="modal-body">
-                               <!-- /# content goes here -->
+               <footer>
+                       <?php if (x($page, 'footer')) echo $page['footer']; ?>
+                       <!-- Modal  -->
+                       <div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+                               <div class="modal-dialog modal-full-screen">
+                                       <div class="modal-content">
+                                               <div id="modal-header" class="modal-header">
+                                                       <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                                                               &times;
+                                                       </button>
+                                                       <h4 id="modal-title" class="modal-title"></h4>
+                                               </div>
+                                               <div id="modal-body" class="modal-body">
+                                                       <!-- /# content goes here -->
+                                               </div>
+                                       </div>
+                               </div>
                        </div>
-               </div>
-       </div>
-</div>
 
-<!-- Dummy div to append other div's when needed (e.g. used for js function editpost() -->
-<div id="cache-container"></div>
+                       <!-- Dummy div to append other div's when needed (e.g. used for js function editpost() -->
+                       <div id="cache-container"></div>
 
-</footer>
-<?php } ?> <!-- End of condition if $minal else the rest -->
-</body>
+               </footer>
+<?php } ?> <!-- End of condition if $minimal else the rest -->
+       </body>
index eb0cbbac65aca7fb568684d56288303d15307fa7..f0aacd4261b46aef87ecaaf674b74cde67d46aa7 100644 (file)
                                </ul>
                        </li>
                {{/if}}
-               
+
                {{if $nav.community}}
                        <li id="nav-community-link" class="nav-menu {{$sel.community}}">
                                <a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
                        </li>
                {{/if}}
-               
+
                {{if $nav.network}}
                        <li id="nav-network-link" class="nav-menu {{$sel.network}}">
                                <a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
                                <span id="net-update" class="nav-notify"></span>
                        </li>
                {{/if}}
+
                {{if $nav.home}}
                        <li id="nav-home-link" class="nav-menu {{$sel.home}}">
                                <a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
                                <span id="home-update" class="nav-notify"></span>
                        </li>
                {{/if}}
-               
+
                {{if $nav.introductions}}
                        <li id="nav-introductions-link" class="nav-menu-icon {{$sel.introductions}}">
                                <a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
@@ -47,7 +48,7 @@
                                <span id="intro-update" class="nav-notify"></span>
                        </li>
                {{/if}}
-               
+
                {{if $nav.messages}}
                        <li id="nav-messages-link" class="nav-menu-icon {{$sel.messages}}">
                                <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
@@ -57,8 +58,6 @@
                        </li>
                {{/if}}
 
-
-               
                {{if $nav.notifications}}
                        <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a accesskey="f" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
                                <span id="notify-update" class="nav-notify"></span>
index 347f3403af31d8e72cc4436f7d180b65d37462fe..faa6027b125dfda6adb2256269ff48c36695eea2 100644 (file)
@@ -30,9 +30,9 @@
                
                        {{if $nav.network}}<li><a id="nav-network-link" class="nav-commlink {{$nav.network.2}}" href="{{$nav.network.0}}">{{$nav.network.1}}</a></li>{{/if}}
                
-                               {{if $nav.community}}
-                               <li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
-                               {{/if}}
+                       {{if $nav.community}}
+                       <li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
+                       {{/if}}
 
                        <li><a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}">{{$nav.search.1}}</a></li>
                        <li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>