diff options
| -rw-r--r-- | include/onedirsync.php | 5 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 2 | ||||
| -rw-r--r-- | mod/dirsearch.php | 5 | ||||
| -rw-r--r-- | mod/sitelist.php | 3 |
6 files changed, 12 insertions, 7 deletions
diff --git a/include/onedirsync.php b/include/onedirsync.php index a1450e183..de8dab92d 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -56,11 +56,10 @@ function onedirsync_run($argv, $argc){ dbesc($r[0]['ud_addr']) ); if(($h) && ($h[0]['hubloc_status'] & HUBLOC_OFFLINE)) { - $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date < '%s' ", + $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ", intval(UPDATE_FLAGS_UPDATED), dbesc($r[0]['ud_addr']), - intval(UPDATE_FLAGS_UPDATED), - dbesc($x[0]['ud_date']) + intval(UPDATE_FLAGS_UPDATED) ); return; diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 52570898b..226ea2308 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -13,6 +13,7 @@ CREATE TABLE IF NOT EXISTS `abook` ( `abook_their_perms` int(11) NOT NULL DEFAULT '0', `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99', `abook_rating` int(11) NOT NULL DEFAULT '0', + `abook_rating_text` TEXT NOT NULL DEFAULT '', `abook_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `abook_connected` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -1529,6 +1530,7 @@ CREATE TABLE IF NOT EXISTS `xlink` ( `xlink_xchan` char(255) NOT NULL DEFAULT '', `xlink_link` char(255) NOT NULL DEFAULT '', `xlink_rating` int(11) NOT NULL DEFAULT '0', + `xlink_rating_text` TEXT NOT NULL DEFAULT '', `xlink_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`xlink_id`), KEY `xlink_xchan` (`xlink_xchan`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index a1b5a76fb..8539e672d 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -7,6 +7,7 @@ CREATE TABLE "abook" ( "abook_their_perms" bigint NOT NULL DEFAULT '0', "abook_closeness" numeric(3) NOT NULL DEFAULT '99', "abook_rating" bigint NOT NULL DEFAULT '0', + "abook_rating_text" TEXT NOT NULL DEFAULT '', "abook_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "abook_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "abook_connected" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', @@ -1142,6 +1143,7 @@ CREATE TABLE "xlink" ( "xlink_xchan" text NOT NULL DEFAULT '', "xlink_link" text NOT NULL DEFAULT '', "xlink_rating" bigint NOT NULL DEFAULT '0', + "xlink_rating_text" TEXT NOT NULL DEFAULT '', "xlink_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY ("xlink_id") ); diff --git a/install/update.php b/install/update.php index f5444089d..8cd25f1bf 100644 --- a/install/update.php +++ b/install/update.php @@ -1515,7 +1515,7 @@ function update_r1133() { xp_client varchar( 20 ) NOT NULL DEFAULT '', xp_channel bigint NOT NULL DEFAULT '0', xp_perm varchar( 64 ) NOT NULL DEFAULT '', - PRIMARY KEY (\"xp_id\") "); + PRIMARY KEY (\"xp_id\") )"); $r2 = q("create index \"xp_client\" on xperm (\"xp_client\", create index \"xp_channel\" on xperm (\"xp_channel\"), create index \"xp_perm\" on xperm (\"xp_perm\") "); diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 4a44feb7d..06d530849 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -355,14 +355,15 @@ function dir_parse_query($s) { function list_public_sites() { + $rand = db_getfunc('rand'); $realm = get_directory_realm(); if($realm == DIRECTORY_REALM) { - $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') order by rand()", + $r = q("select * from site where site_access != 0 and site_register !=0 and ( site_realm = '%s' or site_realm = '') order by $rand", dbesc($realm) ); } else { - $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' order by rand()", + $r = q("select * from site where site_access != 0 and site_register !=0 and site_realm = '%s' order by $rand", dbesc($realm) ); } diff --git a/mod/sitelist.php b/mod/sitelist.php index 95cf862df..4e52f0463 100644 --- a/mod/sitelist.php +++ b/mod/sitelist.php @@ -9,8 +9,9 @@ function sitelist_init(&$a) { $sql_order = " order by site_url "; + $rand = db_getfunc('rand'); if($order == 'random') - $sql_order = " order by rand() "; + $sql_order = " order by $rand "; $sql_limit = " limit $start, $limit "; |