From 0f3b7dd6e96eddb650a9fd47fa6d83fee4a419bc Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 19 Oct 2015 17:01:59 -0700 Subject: update site on initial directory setup --- include/dir_fns.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'include/dir_fns.php') diff --git a/include/dir_fns.php b/include/dir_fns.php index e466b7404..b9f143b55 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -177,16 +177,19 @@ function sync_directories($dirmode) { 'site_update' => NULL_DATE, 'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch', 'site_realm' => DIRECTORY_REALM, - 'site_valid' => 1 + 'site_valid' => 1, + 'site_project' => PLATFORM_NAME + ); - $x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm, site_valid ) - values ( '%s', %d', '%s', '%s', '%s' ) ", + $x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm, site_valid, site_project ) + values ( '%s', %d, '%s', '%s', '%s', %d, '%s' ) ", dbesc($r[0]['site_url']), intval($r[0]['site_flags']), dbesc($r[0]['site_update']), dbesc($r[0]['site_directory']), dbesc($r[0]['site_realm']), - intval($r[0]['site_valid']) + intval($r[0]['site_valid']), + dbesc($r[0]['site_project']) ); $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_type = %d ", -- cgit v1.2.3 From 08a5884c9f39c95200d9895cfc3739e77f07901a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 19 Oct 2015 17:03:34 -0700 Subject: revert - we can't guarantee what project name the fallback directory server has and this could cause bugs later --- include/dir_fns.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'include/dir_fns.php') diff --git a/include/dir_fns.php b/include/dir_fns.php index b9f143b55..ecc5f6d96 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -177,19 +177,17 @@ function sync_directories($dirmode) { 'site_update' => NULL_DATE, 'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch', 'site_realm' => DIRECTORY_REALM, - 'site_valid' => 1, - 'site_project' => PLATFORM_NAME + 'site_valid' => 1 ); - $x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm, site_valid, site_project ) - values ( '%s', %d, '%s', '%s', '%s', %d, '%s' ) ", + $x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm, site_valid ) + values ( '%s', %d, '%s', '%s', '%s', %d ) ", dbesc($r[0]['site_url']), intval($r[0]['site_flags']), dbesc($r[0]['site_update']), dbesc($r[0]['site_directory']), dbesc($r[0]['site_realm']), - intval($r[0]['site_valid']), - dbesc($r[0]['site_project']) + intval($r[0]['site_valid']) ); $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_type = %d ", -- cgit v1.2.3 From e09b49288fa415c85d5ee1e77218c0b4c2b54a1d Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 3 Nov 2015 18:34:16 -0800 Subject: provide admin setting to change directory server --- include/dir_fns.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/dir_fns.php') diff --git a/include/dir_fns.php b/include/dir_fns.php index ecc5f6d96..e5f0e1e2b 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -190,8 +190,9 @@ function sync_directories($dirmode) { intval($r[0]['site_valid']) ); - $r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_type = %d ", - intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY), + $r = q("select * from site where site_flags in (%d, %d) and site_url != '%s' and site_type = %d ", + intval(DIRECTORY_MODE_PRIMARY), + intval(DIRECTORY_MODE_SECONDARY), dbesc(z_root()), intval(SITE_TYPE_ZOT) ); -- cgit v1.2.3