Browse Source

There is now only one central parameter for the global directory.

tags/3.4.2^2
Michael Vogel 4 years ago
parent
commit
5ac38b7f99

+ 1
- 1
doc/Settings.md View File

@@ -200,7 +200,7 @@ This configures the URL to update the global directory, and is supplied in the d
200 200
 The undocumented part is that if this is not set, the global directory is completely unavailable to the application.
201 201
 This allows a private community to be completely isolated from the global mistpark network. 
202 202
 
203
-	$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
203
+	$a->config['system']['directory'] = 'http://dir.friendi.ca';
204 204
 
205 205
 Developer Settings
206 206
 ---

+ 1
- 1
doc/de/Settings.md View File

@@ -138,7 +138,7 @@ Dies erlaubt eine private Kommunikation, die komplett vom globalen Verzeichnis i
138 138
 
139 139
 Konfiguriere:
140 140
 ```
141
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
141
+$a->config['system']['directory'] = 'http://dir.friendi.ca';
142 142
 ```
143 143
 
144 144
 

+ 7
- 22
htconfig.php View File

@@ -1,12 +1,12 @@
1 1
 <?php
2 2
 
3
-// If automatic system installation fails: 
3
+// If automatic system installation fails:
4 4
 
5 5
 // Copy or rename this file to .htconfig.php
6 6
 
7 7
 // Why .htconfig.php? Because it contains sensitive information which could
8
-// give somebody complete control of your database. Apache's default 
9
-// configuration denies access to and refuses to serve any file beginning 
8
+// give somebody complete control of your database. Apache's default
9
+// configuration denies access to and refuses to serve any file beginning
10 10
 // with .ht
11 11
 
12 12
 // Then set the following for your MySQL installation
@@ -26,11 +26,11 @@ $default_timezone = 'America/Los_Angeles';
26 26
 $a->config['sitename'] = "Friendica Social Network";
27 27
 
28 28
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
29
-// Be certain to create your own personal account before setting 
30
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
29
+// Be certain to create your own personal account before setting
30
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
31 31
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
32 32
 // to the email address of an already registered person who can authorise
33
-// and/or approve/deny the request. 
33
+// and/or approve/deny the request.
34 34
 
35 35
 // In order to perform system administration via the admin panel, admin_email
36 36
 // must precisely match the email address of the person logged in.
@@ -51,12 +51,6 @@ $a->config['system']['maximagesize'] = 800000;
51 51
 
52 52
 $a->config['php_path'] = 'php';
53 53
 
54
-// You shouldn't need to change anything else.
55
-// Location of global directory submission page. 
56
-
57
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
58
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
59
-
60 54
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
61 55
 
62 56
 $a->config['system']['huburl'] = '[internal]';
@@ -74,17 +68,8 @@ $a->config['system']['theme'] = 'duepuntozero';
74 68
 
75 69
 $a->config['system']['no_regfullname'] = true;
76 70
 
77
-// If set to true the priority settings of ostatus contacts are used
78
-$a->config['system']['ostatus_use_priority'] = false;
79
-
80
-// If enabled, all items are cached in the given directory
81
-$a->config['system']['itemcache'] = "";
82
-
83
-// If enabled, the lockpath is used for a lockfile to check if the poller is running
84
-$a->config['system']['lockpath'] = "";
85
-
86 71
 //Deny public access to the local directory
87 72
 //$a->config['system']['block_local_dir'] = false;
88 73
 
89
-// Global directory
74
+// Location of the global directory
90 75
 $a->config['system']['directory'] = 'http://dir.friendi.ca';

+ 4
- 2
include/directory.php View File

@@ -7,7 +7,7 @@ function directory_run(&$argv, &$argc){
7 7
 	if(is_null($a)) {
8 8
 		$a = new App;
9 9
 	}
10
-  
10
+
11 11
 	if(is_null($db)) {
12 12
 		@include(".htconfig.php");
13 13
 		require_once("include/dba.php");
@@ -29,11 +29,13 @@ function directory_run(&$argv, &$argc){
29 29
 
30 30
 	$a->set_baseurl(get_config('system','url'));
31 31
 
32
-	$dir = get_config('system','directory_submit_url');
32
+	$dir = get_config('system','directory');
33 33
 
34 34
 	if(! strlen($dir))
35 35
 		return;
36 36
 
37
+	$dir .= "/submit";
38
+
37 39
 	$arr = array('url' => $argv[1]);
38 40
 
39 41
 	call_hooks('globaldir_update', $arr);

+ 1
- 1
include/nav.php View File

@@ -129,7 +129,7 @@ function nav_info(&$a) {
129 129
 	$gdirpath = 'directory';
130 130
 
131 131
 	if(strlen(get_config('system','singleuser'))) {
132
-		$gdir = dirname(get_config('system','directory_submit_url'));
132
+		$gdir = get_config('system','directory');
133 133
 		if(strlen($gdir))
134 134
 			$gdirpath = $gdir;
135 135
 	}

+ 1
- 1
include/profile_update.php View File

@@ -12,7 +12,7 @@ function profile_change() {
12 12
 		return;
13 13
 
14 14
 //   $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
15
-//   if($url && strlen(get_config('system','directory_submit_url')))
15
+//   if($url && strlen(get_config('system','directory')))
16 16
 //      proc_run('php',"include/directory.php","$url");
17 17
 
18 18
 	$recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'

+ 1
- 1
include/socgraph.php View File

@@ -1224,7 +1224,7 @@ function update_suggestions() {
1224 1224
 
1225 1225
 	$done[] = $a->get_baseurl() . '/poco';
1226 1226
 
1227
-	if(strlen(get_config('system','directory_submit_url'))) {
1227
+	if(strlen(get_config('system','directory'))) {
1228 1228
 		$x = fetch_url(get_server()."/pubsites");
1229 1229
 		if($x) {
1230 1230
 			$j = json_decode($x);

+ 1
- 1
include/user.php View File

@@ -33,7 +33,7 @@ function create_user($arr) {
33 33
 	$verified   = ((x($arr,'verified'))   ? intval($arr['verified']) : 0);
34 34
 
35 35
 	$publish    = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
36
-	$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
36
+	$netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0);
37 37
 
38 38
 	if ($password1 != $confirm) {
39 39
 		$result['message'] .= t('Passwords do not match. Password unchanged.') . EOL;

+ 10
- 12
mod/admin.php View File

@@ -363,7 +363,7 @@ function admin_page_site_post(&$a){
363 363
 	$allowed_email		=	((x($_POST,'allowed_email'))		? notags(trim($_POST['allowed_email']))		: '');
364 364
 	$block_public		=	((x($_POST,'block_public'))		? True						: False);
365 365
 	$force_publish		=	((x($_POST,'publish_all'))		? True						: False);
366
-	$global_directory	=	((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
366
+	$global_directory	=	((x($_POST,'directory'))		? notags(trim($_POST['directory']))	: '');
367 367
 	$thread_allow		=	((x($_POST,'thread_allow'))		? True						: False);
368 368
 	$newuser_private		=	((x($_POST,'newuser_private'))		? True						: False);
369 369
 	$enotify_no_content		=	((x($_POST,'enotify_no_content'))	? True						: False);
@@ -514,15 +514,7 @@ function admin_page_site_post(&$a){
514 514
 	set_config('system','allowed_email', $allowed_email);
515 515
 	set_config('system','block_public', $block_public);
516 516
 	set_config('system','publish_all', $force_publish);
517
-	if ($global_directory==""){
518
-		// don't know why, but del_config doesn't work...
519
-		q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
520
-			dbesc("system"),
521
-			dbesc("directory_submit_url")
522
-		);
523
-	} else {
524
-		set_config('system','directory_submit_url', $global_directory);
525
-	}
517
+	set_config('system','directory', $global_directory);
526 518
 	set_config('system','thread_allow', $thread_allow);
527 519
 	set_config('system','newuser_private', $newuser_private);
528 520
 	set_config('system','enotify_no_content', $enotify_no_content);
@@ -578,7 +570,7 @@ function admin_page_site(&$a) {
578 570
 
579 571
 	/* Installed langs */
580 572
 	$lang_choices = array();
581
-	$langs = glob('view/*/strings.php');
573
+	$langs = glob('view/*/strings.php'); /**/
582 574
 
583 575
 	if(is_array($langs) && count($langs)) {
584 576
 		if(! in_array('view/en/strings.php',$langs))
@@ -590,6 +582,12 @@ function admin_page_site(&$a) {
590 582
 		}
591 583
 	}
592 584
 
585
+	if (strlen(get_config('system','directory_submit_url')) AND
586
+		!strlen(get_config('system','directory'))) {
587
+		set_config('system','directory', dirname(get_config('system','directory_submit_url')));
588
+		del_config('system','directory_submit_url');
589
+	}
590
+
593 591
 	/* Installed themes */
594 592
 	$theme_choices = array();
595 593
 	$theme_choices_mobile = array();
@@ -719,7 +717,7 @@ function admin_page_site(&$a) {
719 717
 		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
720 718
 		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
721 719
 		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
722
-		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
720
+		'$global_directory'	=> array('directory', t("Global directory URL"), get_config('system','directory'), t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")),
723 721
 		'$thread_allow'		=> array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
724 722
 		'$newuser_private'	=> array('newuser_private', t("Private posts by default for new users"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
725 723
 		'$enotify_no_content'	=> array('enotify_no_content', t("Don't include post content in email notifications"), get_config('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),

+ 1
- 1
mod/directory.php View File

@@ -47,7 +47,7 @@ function directory_content(&$a) {
47 47
 	$tpl = get_markup_template('directory_header.tpl');
48 48
 
49 49
 	$globaldir = '';
50
-	$gdirpath = dirname(get_config('system','directory_submit_url'));
50
+	$gdirpath = get_config('system','directory');
51 51
 	if(strlen($gdirpath)) {
52 52
 		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
53 53
 		. zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';

+ 3
- 1
mod/dirfind.php View File

@@ -100,7 +100,7 @@ function dirfind_content(&$a, $prefix = "") {
100 100
 
101 101
 			$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
102 102
 
103
-			if(strlen(get_config('system','directory_submit_url')))
103
+			if(strlen(get_config('system','directory')))
104 104
 				$x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
105 105
 
106 106
 			$j = json_decode($x);
@@ -125,6 +125,8 @@ function dirfind_content(&$a, $prefix = "") {
125 125
 					$conntxt = t('Connect');
126 126
 				}
127 127
 
128
+				$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
129
+
128 130
 				$o .= replace_macros($tpl,array(
129 131
 					'$url' => zrl($jj->url),
130 132
 					'$name' => $jj->name,

+ 5
- 5
mod/invite.php View File

@@ -112,15 +112,15 @@ function invite_content(&$a) {
112 112
 			notice( t('You have no more invitations available') . EOL);
113 113
 			return '';
114 114
 		}
115
-	}			
115
+	}
116 116
 
117
-	$dirloc = get_config('system','directory_submit_url');
117
+	$dirloc = get_config('system','directory');
118 118
 	if(strlen($dirloc)) {
119 119
 		if($a->config['register_policy'] == REGISTER_CLOSED)
120
-			$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
120
+			$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo');
121 121
 		elseif($a->config['register_policy'] != REGISTER_CLOSED)
122 122
 			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
123
-			. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo');
123
+			. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo');
124 124
 	}
125 125
 	else {
126 126
 		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
@@ -141,4 +141,4 @@ function invite_content(&$a) {
141 141
 	));
142 142
 
143 143
 	return $o;
144
-}
144
+}

+ 27
- 23
mod/match.php View File

@@ -1,5 +1,7 @@
1 1
 <?php
2 2
 include_once('include/text.php');
3
+require_once('include/socgraph.php');
4
+require_once('include/contact_widgets.php');
3 5
 
4 6
 function match_content(&$a) {
5 7
 
@@ -7,6 +9,9 @@ function match_content(&$a) {
7 9
 	if(! local_user())
8 10
 		return;
9 11
 
12
+	$a->page['aside'] .= follow_widget();
13
+	$a->page['aside'] .= findpeople_widget();
14
+
10 15
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
11 16
 
12 17
 	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
@@ -17,7 +22,7 @@ function match_content(&$a) {
17 22
 		intval(local_user())
18 23
 	);
19 24
 	if(! count($r))
20
-		return; 
25
+		return;
21 26
 	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
22 27
 		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
23 28
 		return;
@@ -32,7 +37,7 @@ function match_content(&$a) {
32 37
 		if($a->pager['page'] != 1)
33 38
 			$params['p'] = $a->pager['page'];
34 39
 
35
-		if(strlen(get_config('system','directory_submit_url')))
40
+		if(strlen(get_config('system','directory')))
36 41
 			$x = post_url(get_server().'/msearch', $params);
37 42
 		else
38 43
 			$x = post_url($a->get_baseurl() . '/msearch', $params);
@@ -47,31 +52,30 @@ function match_content(&$a) {
47 52
 		if(count($j->results)) {
48 53
 
49 54
 
50
-			
55
+
51 56
 			$tpl = get_markup_template('match.tpl');
52 57
 			foreach($j->results as $jj) {
53
-			    $match_nurl = normalise_link($jj->url);
54
-			    $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
55
-				intval(local_user()),
56
-				dbesc($match_nurl));
57
-			    if (!count($match)) {
58
-				
59
-				$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
60
-				$o .= replace_macros($tpl,array(
61
-					'$url' => zrl($jj->url),
62
-					'$name' => $jj->name,
63
-					'$photo' => proxy_url($jj->photo),
64
-					'$inttxt' => ' ' . t('is interested in:'),
65
-					'$conntxt' => t('Connect'),
66
-					'$connlnk' => $connlnk,
67
-					'$tags' => $jj->tags
68
-				));
69
-			    }
58
+				$match_nurl = normalise_link($jj->url);
59
+				$match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
60
+					intval(local_user()),
61
+					dbesc($match_nurl));
62
+				if (!count($match)) {
63
+					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
64
+					$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
65
+					$o .= replace_macros($tpl,array(
66
+						'$url' => zrl($jj->url),
67
+						'$name' => $jj->name,
68
+						'$photo' => proxy_url($jj->photo),
69
+						'$inttxt' => ' ' . t('is interested in:'),
70
+						'$conntxt' => t('Connect'),
71
+						'$connlnk' => $connlnk,
72
+						'$tags' => $jj->tags
73
+					));
74
+				}
70 75
 			}
71
-		}
72
-		else {
76
+		} else {
73 77
 			info( t('No matches') . EOL);
74
-		}		
78
+		}
75 79
 
76 80
 	}
77 81
 

+ 2
- 2
mod/profile_photo.php View File

@@ -118,7 +118,7 @@ function profile_photo_post(&$a) {
118 118
 				info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
119 119
 				// Update global directory in background
120 120
 				$url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
121
-				if($url && strlen(get_config('system','directory_submit_url')))
121
+				if($url && strlen(get_config('system','directory')))
122 122
 					proc_run('php',"include/directory.php","$url");
123 123
 
124 124
 				require_once('include/profile_update.php');
@@ -217,7 +217,7 @@ function profile_photo_content(&$a) {
217 217
 
218 218
 			// Update global directory in background
219 219
 			$url = $_SESSION['my_url'];
220
-			if($url && strlen(get_config('system','directory_submit_url')))
220
+			if($url && strlen(get_config('system','directory')))
221 221
 				proc_run('php',"include/directory.php","$url");
222 222
 
223 223
 			goaway($a->get_baseurl() . '/profiles');

+ 1
- 1
mod/profiles.php View File

@@ -508,7 +508,7 @@ function profiles_post(&$a) {
508 508
 
509 509
 			// Update global directory in background
510 510
 			$url = $_SESSION['my_url'];
511
-			if($url && strlen(get_config('system','directory_submit_url')))
511
+			if($url && strlen(get_config('system','directory')))
512 512
 				proc_run('php',"include/directory.php","$url");
513 513
 
514 514
 			require_once('include/profile_update.php');

+ 1
- 1
mod/regmod.php View File

@@ -36,7 +36,7 @@ function user_allow($hash) {
36 36
 	);
37 37
 	if(count($r) && $r[0]['net-publish']) {
38 38
 		$url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
39
-		if($url && strlen(get_config('system','directory_submit_url')))
39
+		if($url && strlen(get_config('system','directory')))
40 40
 			proc_run('php',"include/directory.php","$url");
41 41
 	}
42 42
 

+ 2
- 2
mod/settings.php View File

@@ -582,7 +582,7 @@ function settings_post(&$a) {
582 582
 	if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
583 583
 		// Update global directory in background
584 584
 		$url = $_SESSION['my_url'];
585
-		if($url && strlen(get_config('system','directory_submit_url')))
585
+		if($url && strlen(get_config('system','directory')))
586 586
 			proc_run('php',"include/directory.php","$url");
587 587
 
588 588
 	}
@@ -1069,7 +1069,7 @@ function settings_content(&$a) {
1069 1069
 		));
1070 1070
 	}
1071 1071
 
1072
-	if(strlen(get_config('system','directory_submit_url'))) {
1072
+	if(strlen(get_config('system','directory'))) {
1073 1073
 		$profile_in_net_dir = replace_macros($opt_tpl,array(
1074 1074
 			'$field' 	=> array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),
1075 1075
 		));

+ 12
- 11
util/htconfig.vagrant.php View File

@@ -11,10 +11,10 @@ $db_data = 'friendica';
11 11
 // If you are using a subdirectory of your domain you will need to put the
12 12
 // relative path (from the root of your domain) here.
13 13
 // For instance if your URL is 'http://example.com/directory/subdirectory',
14
-// set path to 'directory/subdirectory'. 
14
+// set path to 'directory/subdirectory'.
15 15
 
16 16
 $a->path = '';
17
- 
17
+
18 18
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
19 19
 // It can be changed later and only applies to timestamps for anonymous viewers.
20 20
 
@@ -25,8 +25,8 @@ $default_timezone = 'Europe/Berlin';
25 25
 $a->config['sitename'] = "My Friend Network";
26 26
 
27 27
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
28
-// Be certain to create your own personal account before setting 
29
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
28
+// Be certain to create your own personal account before setting
29
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
30 30
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
31 31
 // to the email address of an already registered person who can authorise
32 32
 // and/or approve/deny the request.
@@ -47,18 +47,13 @@ $a->config['system']['maximagesize'] = 800000;
47 47
 
48 48
 $a->config['php_path'] = '/usr/bin/php';
49 49
 
50
-// Location of global directory submission page.
51
-
52
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
53
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
54
-
55 50
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
56 51
 
57 52
 $a->config['system']['huburl'] = '[internal]';
58 53
 
59
-// Server-to-server private message encryption (RINO) is allowed by default. 
54
+// Server-to-server private message encryption (RINO) is allowed by default.
60 55
 // Encryption will only be provided if this setting is true and the
61
-// PHP mcrypt extension is installed on both systems 
56
+// PHP mcrypt extension is installed on both systems
62 57
 
63 58
 $a->config['system']['rino_encrypt'] = true;
64 59
 
@@ -69,3 +64,9 @@ $a->config['system']['theme'] = 'duepuntozero';
69 64
 // By default allow pseudonyms
70 65
 
71 66
 $a->config['system']['no_regfullname'] = true;
67
+
68
+//Deny public access to the local directory
69
+//$a->config['system']['block_local_dir'] = false;
70
+
71
+// Location of the global directory
72
+$a->config['system']['directory'] = 'http://dir.friendi.ca';

+ 11
- 10
view/templates/htconfig.tpl View File

@@ -11,7 +11,7 @@ $db_data = '{{$dbdata}}';
11 11
 // If you are using a subdirectory of your domain you will need to put the
12 12
 // relative path (from the root of your domain) here.
13 13
 // For instance if your URL is 'http://example.com/directory/subdirectory',
14
-// set path to 'directory/subdirectory'. 
14
+// set path to 'directory/subdirectory'.
15 15
 
16 16
 $a->path = '{{$urlpath}}';
17 17
  
@@ -25,8 +25,8 @@ $default_timezone = '{{$timezone}}';
25 25
 $a->config['sitename'] = "My Friend Network";
26 26
 
27 27
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
28
-// Be certain to create your own personal account before setting 
29
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
28
+// Be certain to create your own personal account before setting
29
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
30 30
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
31 31
 // to the email address of an already registered person who can authorise
32 32
 // and/or approve/deny the request.
@@ -47,18 +47,13 @@ $a->config['system']['maximagesize'] = 800000;
47 47
 
48 48
 $a->config['php_path'] = '{{$phpath}}';
49 49
 
50
-// Location of global directory submission page.
51
-
52
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
53
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
54
-
55 50
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
56 51
 
57 52
 $a->config['system']['huburl'] = '[internal]';
58 53
 
59
-// Server-to-server private message encryption (RINO) is allowed by default. 
54
+// Server-to-server private message encryption (RINO) is allowed by default.
60 55
 // Encryption will only be provided if this setting is true and the
61
-// PHP mcrypt extension is installed on both systems 
56
+// PHP mcrypt extension is installed on both systems
62 57
 
63 58
 $a->config['system']['rino_encrypt'] = true;
64 59
 
@@ -69,3 +64,9 @@ $a->config['system']['theme'] = 'duepuntozero';
69 64
 // By default allow pseudonyms
70 65
 
71 66
 $a->config['system']['no_regfullname'] = true;
67
+
68
+//Deny public access to the local directory
69
+//$a->config['system']['block_local_dir'] = false;
70
+
71
+// Location of the global directory
72
+$a->config['system']['directory'] = 'http://dir.friendi.ca';

Loading…
Cancel
Save