admin/opensim-helpers
1
0
Fork 0
mirror of https://github.com/GuduleLapointe/opensim-helpers.git synced 2026-08-14 08:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

* use SEARCH_TABLE_EVENTS constant instead of default events table name

Browse Source
This commit is contained in:
Olivier van Helden (grd01)
2024-08-18 23:22:43 +00:00
parent 9b2d2713b4
commit e4f0f08ba6
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eventsparser.php
+2 -2
View File
@@ -125,9 +125,9 @@ foreach ( $json as $json_event ) {
}
if ( is_object( $SearchDB ) && $SearchDB->connected ) {
$SearchDB->query( 'DELETE FROM events' );
$SearchDB->query( 'DELETE FROM ' . SEARCH_TABLE_EVENTS );
foreach ( $events as $event ) {
$result = $SearchDB->insert( 'events', $event );
$result = $SearchDB->insert( SEARCH_TABLE_EVENTS, $event );
if ( ! $result ) {
error_log( 'error while inserting new events)' );
}
includes/search.php
+10 -3
View File
@@ -16,6 +16,10 @@
* [OpenSimSearch](https://github.com/kcozens/OpenSimSearch)
*/
if ( ! defined( 'SEARCH_TABLE_EVENTS' ) ) {
define( 'SEARCH_TABLE_EVENTS', 'events' );
}
function ossearch_db_tables( $db ) {
if ( ! $db->connected ) {
return false;
@@ -55,7 +59,7 @@ function ossearch_db_tables( $db ) {
PRIMARY KEY (`classifieduuid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
CREATE TABLE IF NOT EXISTS `events` (
CREATE TABLE IF NOT EXISTS `" . SEARCH_TABLE_EVENTS . "` (
`owneruuid` char(36) NOT NULL,
`name` varchar(255) NOT NULL,
`eventid` int(11) unsigned NOT NULL AUTO_INCREMENT,
@@ -71,6 +75,9 @@ function ossearch_db_tables( $db ) {
`globalPos` varchar(255) NOT NULL,
`eventflags` int(1) NOT NULL,
`gatekeeperURL` varchar(255),
`landingpoint` varchar(35) DEFAULT NULL, -- JOpenSim compatibility
`parcelName` varchar(255) DEFAULT NULL, -- JOpenSim compatibility
`mature` enum('true','false') NOT NULL, -- JOpenSim compatibility
PRIMARY KEY (`eventid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -166,7 +173,7 @@ function ossearch_db_update_1() {
return false;
}
$tables = array( 'allparcels', 'classifieds', 'events', 'hostsregister', 'objects', 'parcels', 'parcelsales', 'popularplaces', 'regions' );
$tables = array( 'allparcels', 'classifieds', SEARCH_TABLE_EVENTS, 'hostsregister', 'objects', 'parcels', 'parcelsales', 'popularplaces', 'regions' );
foreach ( $tables as $table ) {
if ( ! count( $SearchDB->query( "SHOW COLUMNS FROM `$table` LIKE 'gatekeeperURL'" )->fetchAll() ) ) {
$SearchDB->query( "ALTER TABLE $table ADD gatekeeperURL varchar(255)" );
@@ -259,7 +266,7 @@ if ( $SearchDB && $SearchDB->connected ) {
}
define( 'SEARCH_REGION_TABLE', $regions_table );
if ( ! tableExists( $SearchDB, array( SEARCH_REGION_TABLE, 'parcels', 'parcelsales', 'allparcels', 'objects', 'popularplaces', 'events', 'classifieds', 'hostsregister' ) ) ) {
if ( ! tableExists( $SearchDB, array( SEARCH_REGION_TABLE, 'parcels', 'parcelsales', 'allparcels', 'objects', 'popularplaces', SEARCH_TABLE_EVENTS, 'classifieds', 'hostsregister' ) ) ) {
error_log( 'Creating missing OpenSimSearch tables in ' . SEARCH_DB_NAME );
ossearch_db_tables( $SearchDB );
}