diaspora admin toggle, update install guide

diff --git a/INSTALL.txt b/INSTALL.txt
index dd4c747e2ae4be2068ae791a37153d8144808e37..053c339028c9f5bda2e55639003d8c6d449cd4ee 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -15,20 +15,32 @@ hosting provider prior to installation.
 Before you begin: Choose a domain name or subdomain name for your server.
 Put some thought into this - because changing it is currently not-supported.
 Things will break, and some of your friends may have difficulty communicating
 Before you begin: Choose a domain name or subdomain name for your server.
 Put some thought into this - because changing it is currently not-supported.
 Things will break, and some of your friends may have difficulty communicating

-with you. We plan to address this limitation in a future release. 
+with you. We plan to address this limitation in a future release. Also decide
+if you wish to connect with members of the Diaspora network, as this will 
+impact the installation requirements.
+
+Decide if you will use SSL and obtain an SSL cert. Communications with the
+Diaspora network MAY require both SSL AND an SSL cert signed by a CA which is 
+recognised by the major browsers. Friendika will work with self-signed certs
+but Diaspora communication may not. For best results, install your cert PRIOR
+to installing Friendika and when visiting your site for the initial 
+installation in step 5, please use the https: link. (Use the http: or non-SSL 
+link if your cert is self-signed). 

  
 
 1. Requirements
        - Apache with mod-rewrite enabled and "Options All" so you can use a 
 local .htaccess file
 
  
 
 1. Requirements
        - Apache with mod-rewrite enabled and "Options All" so you can use a 
 local .htaccess file
 

-       - PHP 5.2+. The later the better. You'll need 5.3 for encryption of key
-exchange conversations
+       - PHP 5.2+. The later the better. PHP 5.3 is required for communications 
+with the Diaspora network and improved security.
+

                - PHP *command line* access with register_argc_argv set to true in the 
                - PHP *command line* access with register_argc_argv set to true in the 

-php.ini file
-               - curl, gd, mysql, mbstring, and openssl extensions
+php.ini file [or see 'poormancron' in section 8]
+
+               - curl, gd, mysql, mbstring, mcrypt, and openssl extensions
+

                - some form of email server or email gateway such that PHP mail() works
                - some form of email server or email gateway such that PHP mail() works

-               - mcrypt (optional; used for end-to-end message encryption)

 
        - Mysql 5.x
 
 
        - Mysql 5.x
 


@@ -36,12 +48,8 @@ php.ini file
 (Windows) [Note: other options are presented in Section 8 of this document]
 
        - Installation into a top-level domain or sub-domain (without a 
 (Windows) [Note: other options are presented in Section 8 of this document]
 
        - Installation into a top-level domain or sub-domain (without a 

-directory/path component in the URL) is preferred. Directory paths will
-not be as convenient to use and have not been thoroughly tested.  
-
-       [Dreamhost.com offers all of the necessary hosting features at a 
-reasonable price. If your hosting provider doesn't allow Unix shell access, 
-you might have trouble getting everything to work.] 
+directory/path component in the URL) is preferred. This is REQUIRED if
+you wish to communicate with the Diaspora network.

 
 2. Unpack the Friendika files into the root of your web server document area.
 
 
 2. Unpack the Friendika files into the root of your web server document area.
 


@@ -58,7 +66,9 @@ write or create files in your web directory, create an empty file called
 .htconfig.php and make it writable by the web server.
 
 5. Visit your website with a web browser and follow the instructions. Please 
 .htconfig.php and make it writable by the web server.
 
 5. Visit your website with a web browser and follow the instructions. Please 

-note any error messages and correct these before continuing.
+note any error messages and correct these before continuing. If you are using
+SSL with a known signature authority (recommended), use the https: link to your
+website. If you are using a self-signed cert or no cert, use the http: link. 

 
 6. *If* the automated installation fails for any reason, check the following:
 
 
 6. *If* the automated installation fails for any reason, check the following:
 


@@ -99,7 +109,9 @@ have troubles with this section please contact your hosting provider for
 assistance. Friendika will not work correctly if you cannot perform this step.
   
 Alternative: You may be able to use the 'poormancron' plugin to perform this
 assistance. Friendika will not work correctly if you cannot perform this step.
   
 Alternative: You may be able to use the 'poormancron' plugin to perform this

-step if you are using a recent Friendika release. To do this, edit the file 
+step if you are using a recent Friendika release. 'poormancron' may result in
+perfomance and memory issues and is only suitable for small sites with one or
+two users and a handful of contacts. To do this, edit the file 

 ".htconfig.php" and look for a line describing your plugins. On a fresh 
 installation, it will look like
 
 ".htconfig.php" and look for a line describing your plugins. On a fresh 
 installation, it will look like
 


@@ -114,7 +126,7 @@ $a->config['system']['addon'] = 'js_upload,poormancron';
 and save your changes.
 
 
 and save your changes.
 
 

-
+ 

 #####################################################################
 
                If things don't work...
 #####################################################################
 
                If things don't work...

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index ed59daff61d8cfa23d2be99fa3e31b42b75822b4..33895f80d77bda7a414bad2e7a62dea85b2b75e3 100644 (file)
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -151,6 +151,8 @@ function fb_get_friends($uid) {
                logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
                $j = json_decode($s);
                logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);
                logger('facebook: fb_get_friends: ' . $s, LOGGER_DATA);
                $j = json_decode($s);
                logger('facebook: fb_get_friends: json: ' . print_r($j,true), LOGGER_DATA);

+               if(! $j->data)
+                       return;

                foreach($j->data as $person) {
                        $s = fetch_url('https://graph.facebook.com/' . $person->id . '?access_token=' . $access_token);
                        if($s) {
                foreach($j->data as $person) {
                        $s = fetch_url('https://graph.facebook.com/' . $person->id . '?access_token=' . $access_token);
                        if($s) {

diff --git a/boot.php b/boot.php
index ae3c04b77cd42499577aa701071fb9c448821b9e..b0ff7830c6fd5fe302fde4c5cac2c9a7b32f93c7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 
 
 require_once("include/pgettext.php");
 
 

-define ( 'FRIENDIKA_VERSION',      '2.2.1079' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1080' );

 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1081      );
 
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1081      );
 

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 48ba77a88866aa49b4b801f48e29ceca1f0b56ed..66fe104eaab2aee3acc1901564cb2064ea6b756f 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -170,7 +170,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                $sql_extra .= " AND `network` IN ( 'dfrn' ) ";
        }
        elseif($privatenet) {   
                $sql_extra .= " AND `network` IN ( 'dfrn' ) ";
        }
        elseif($privatenet) {   

-               $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) ";
+               $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face', 'dspr' ) ";

        }
 
 
        }
 
 

diff --git a/include/network.php b/include/network.php
index d4f0d8aa76ba359d590c21a564c5ba932640f685..f0dd828d14cb7508b45a4d7f373f35d62c564f01 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -508,7 +508,7 @@ function fetch_xrd_links($url) {
 
        $xrd_timeout = intval(get_config('system','xrd_timeout'));
        $redirects = 0;
 
        $xrd_timeout = intval(get_config('system','xrd_timeout'));
        $redirects = 0;

-       $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 30));
+       $xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 20));

 
        logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
 
 
        logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
 

diff --git a/mod/admin.php b/mod/admin.php
index 1a926443f8b4f08f96d6ba4c6d6e5f06b1039258..7799e64ab1a9fb1e468287a16835f5fe6be9a326 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -197,6 +197,7 @@ function admin_page_site_post(&$a){
        $timeout                        =       ((x($_POST,'timeout'))                  ? intval(trim($_POST['timeout']))               : 60);
        $dfrn_only          =   ((x($_POST,'dfrn_only'))            ? True      :       False);
     $ostatus_disabled   =   !((x($_POST,'ostatus_disabled')) ? True  :   False);
        $timeout                        =       ((x($_POST,'timeout'))                  ? intval(trim($_POST['timeout']))               : 60);
        $dfrn_only          =   ((x($_POST,'dfrn_only'))            ? True      :       False);
     $ostatus_disabled   =   !((x($_POST,'ostatus_disabled')) ? True  :   False);

+       $diaspora_enabled   =   ((x($_POST,'diaspora_enabled')) ? True   :  False);

 
 
        set_config('config','sitename',$sitename);
 
 
        set_config('config','sitename',$sitename);


@@ -241,6 +242,7 @@ function admin_page_site_post(&$a){
        set_config('system','curl_timeout', $timeout);
        set_config('system','dfrn_only', $dfrn_only);
        set_config('system','ostatus_disabled', $ostatus_disabled);
        set_config('system','curl_timeout', $timeout);
        set_config('system','dfrn_only', $dfrn_only);
        set_config('system','ostatus_disabled', $ostatus_disabled);

+       set_config('system','diaspora_enabled', $diaspora_enabled);

 
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl() . '/admin/site' );
 
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl() . '/admin/site' );


@@ -325,6 +327,7 @@ function admin_page_site(&$a) {
                '$no_utf'                       => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), "Use PHP UTF8 regular expressions"),
                '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."),
                '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."),    
                '$no_utf'                       => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), "Use PHP UTF8 regular expressions"),
                '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."),
                '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."),    

+               '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."),    

                '$dfrn_only'        => array('dfrn_only', t('Only allow Friendika contacts'), get_config('system','dfrn_only'), "All contacts must use Friendika protocols. All other built-in communication protocols disabled."),
                '$verifyssl'            => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."),
                '$proxyuser'            => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
                '$dfrn_only'        => array('dfrn_only', t('Only allow Friendika contacts'), get_config('system','dfrn_only'), "All contacts must use Friendika protocols. All other built-in communication protocols disabled."),
                '$verifyssl'            => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."),
                '$proxyuser'            => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),

diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 5ee0125de6aa8455bb831f239df38211cae9886a..061656df760c8d558fa1c90ba40227785b92d2f0 100644 (file)
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -31,6 +31,7 @@
        {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}

+       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}

        {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
        {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
        
        {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
        {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}