clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

term (tag, mention, category, file, etc.) table

This commit is contained in:
friendica 2012-07-05 17:59:56 -07:00
parent 8af78079cb
commit d7920c4c25
3 changed files with 63 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
boot.php
View File

@ -12,7 +12,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1395' ); define ( 'FRIENDICA_VERSION', '3.0.1395' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1152 ); define ( 'DB_UPDATE_VERSION', 1153 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@ -195,6 +195,22 @@ define ( 'NOTIFY_TAGSHARE', 0x0100 );
define ( 'NOTIFY_SYSTEM', 0x8000 ); define ( 'NOTIFY_SYSTEM', 0x8000 );
/**
* Tag/term types
*/
define ( 'TERM_UNKNOWN', 0 );
define ( 'TERM_HASHTAG', 1 );
define ( 'TERM_MENTION', 2 );
define ( 'TERM_CATEGORY', 3 );
define ( 'TERM_PCATEGORY', 4 );
define ( 'TERM_FILE', 5 );
define ( 'TERM_OBJ_POST', 1 );
define ( 'TERM_OBJ_PHOTO', 2 );
/** /**
* various namespaces we may need to parse * various namespaces we may need to parse
*/ */
@ -370,13 +386,15 @@ if(! class_exists('App')) {
if(x($_SERVER,'SERVER_NAME')) { if(x($_SERVER,'SERVER_NAME')) {
$this->hostname = $_SERVER['SERVER_NAME']; $this->hostname = $_SERVER['SERVER_NAME'];
if(stristr($this->hostname,'xn--')) {
// See bug 437 - this didn't work so disabling it
//if(stristr($this->hostname,'xn--')) {
// PHP or webserver may have converted idn to punycode, so // PHP or webserver may have converted idn to punycode, so
// convert punycode back to utf-8 // convert punycode back to utf-8
require_once('library/simplepie/idn/idna_convert.class.php'); // require_once('library/simplepie/idn/idna_convert.class.php');
$x = new idna_convert(); // $x = new idna_convert();
$this->hostname = $x->decode($_SERVER['SERVER_NAME']); // $this->hostname = $x->decode($_SERVER['SERVER_NAME']);
} //}
if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
$this->hostname .= ':' . $_SERVER['SERVER_PORT']; $this->hostname .= ':' . $_SERVER['SERVER_PORT'];

20
database.sql
View File

@ -1000,6 +1000,26 @@ CREATE TABLE IF NOT EXISTS `spam` (
-- -------------------------------------------------------- -- --------------------------------------------------------
--
-- Table structure for table `term`
--
CREATE TABLE IF NOT EXISTS `term` (
`tid` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`oid` INT UNSIGNED NOT NULL ,
`otype` TINYINT( 3 ) UNSIGNED NOT NULL ,
`type` TINYINT( 3 ) UNSIGNED NOT NULL ,
`term` CHAR( 255 ) NOT NULL ,
`url` CHAR( 255 ) NOT NULL,
PRIMARY KEY (`tid`),
KEY `oid` ( `oid` ),
KEY `otype` ( `otype` ),
KEY `type` ( `type` ),
KEY `term` ( `term` )
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
-- --
-- Table structure for table `tokens` -- Table structure for table `tokens`
-- --

20
update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1152 ); define( 'UPDATE_VERSION' , 1153 );
/** /**
* *
@ -1319,3 +1319,21 @@ function update_1151() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
function update_1152() {
$r = q("CREATE TABLE IF NOT EXISTS `term` (
`tid` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`oid` INT UNSIGNED NOT NULL ,
`otype` TINYINT( 3 ) UNSIGNED NOT NULL ,
`type` TINYINT( 3 ) UNSIGNED NOT NULL ,
`term` CHAR( 255 ) NOT NULL ,
`url` CHAR( 255 ) NOT NULL,
KEY `oid` ( `oid` ),
KEY `otype` ( `otype` ),
KEY `type` ( `type` ),
KEY `term` ( `term` )
) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
if (!$r)
return UPDATE_FAILED;
return UPDATE_SUCCESS;
}