diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 04:21:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-28 04:21:29 -0700 |
| commit | dbeae16dc142c3bc832718b0c29eefd6a82033d6 (patch) | |
| tree | 79307eaed3cf795f5adfc3677b0fa2685b048816 | |
| parent | edbcba6f113a5c8b709cdbfca892e845b5096ede (diff) | |
| download | volse-hubzilla-dbeae16dc142c3bc832718b0c29eefd6a82033d6.tar.gz volse-hubzilla-dbeae16dc142c3bc832718b0c29eefd6a82033d6.tar.bz2 volse-hubzilla-dbeae16dc142c3bc832718b0c29eefd6a82033d6.zip | |
add site_type to queries, first few - several more to go.
| -rw-r--r-- | include/checksites.php | 5 | ||||
| -rw-r--r-- | include/externals.php | 5 | ||||
| -rw-r--r-- | include/hubloc.php | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/include/checksites.php b/include/checksites.php index e14837255..e9c08c202 100644 --- a/include/checksites.php +++ b/include/checksites.php @@ -25,8 +25,9 @@ function checksites_run($argv, $argc){ if($days < 1) $days = 30; - $r = q("select * from site where site_dead = 0 and site_update < %s - INTERVAL %s $sql_options ", - db_utcnow(), db_quoteinterval($days . ' DAY') + $r = q("select * from site where site_dead = 0 and site_update < %s - INTERVAL %s and site_type = %d $sql_options ", + db_utcnow(), db_quoteinterval($days . ' DAY'), + intval(SITE_TYPE_ZOT) ); if(! $r) diff --git a/include/externals.php b/include/externals.php index 3b6d170d5..18c034bb2 100644 --- a/include/externals.php +++ b/include/externals.php @@ -28,9 +28,10 @@ function externals_run($argv, $argc){ } else { $randfunc = db_getfunc('RAND'); - $r = q("select site_url, site_pull from site where site_url != '%s' and site_flags != %d order by $randfunc limit 1", + $r = q("select site_url, site_pull from site where site_url != '%s' and site_flags != %d and site_type = %d order by $randfunc limit 1", dbesc(z_root()), - intval(DIRECTORY_MODE_STANDALONE) + intval(DIRECTORY_MODE_STANDALONE), + intval(SITE_TYPE_ZOT) ); if($r) $url = $r[0]['site_url']; diff --git a/include/hubloc.php b/include/hubloc.php index 674a3885f..a1171b0e2 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -16,7 +16,9 @@ function is_matrix_url($url) { function prune_hub_reinstalls() { - $r = q("select site_url from site where true"); + $r = q("select site_url from site where site_type = %d", + intval(SITE_TYPE_ZOT) + ); if($r) { foreach($r as $rr) { $x = q("select count(*) as t, hubloc_sitekey, max(hubloc_connected) as c from hubloc where hubloc_url = '%s' group by hubloc_sitekey order by c", |