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

diff --git a/boot.php b/boot.php
index 0b4c66b6321fab456cdb61fa11855a15b0e7b270..effe237852c4419c5e7965dc14cd503b72802136 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('include/cache.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.0.1395' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1152      );
+define ( 'DB_UPDATE_VERSION',      1153      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -195,6 +195,22 @@ define ( 'NOTIFY_TAGSHARE', 0x0100 );
 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
  */
@@ -370,13 +386,15 @@ if(! class_exists('App')) {
 
                        if(x($_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
                                        // convert punycode back to utf-8
-                                       require_once('library/simplepie/idn/idna_convert.class.php');
-                                       $x = new idna_convert();
-                                       $this->hostname = $x->decode($_SERVER['SERVER_NAME']);
-                               }
+                               //      require_once('library/simplepie/idn/idna_convert.class.php');
+                               //      $x = new idna_convert();
+                               //      $this->hostname = $x->decode($_SERVER['SERVER_NAME']);
+                               //}
 
                                if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
                                        $this->hostname .= ':' . $_SERVER['SERVER_PORT'];

diff --git a/database.sql b/database.sql
index bd57d9fdde494a09f975c8d410b14f4e6dde6bd3..1d0a321760cbe9c3b77baf5d020d80b7ac81841a 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -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`
 --

diff --git a/update.php b/update.php
index 28fe469f19c7b39f2117b7fd63cf682f2784a89f..d752eaa6df99750d4047107855eec248dceaea34 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1152 );
+define( 'UPDATE_VERSION' , 1153 );
 
 /**
  *
@@ -1319,3 +1319,21 @@ function update_1151() {
        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;
+}
+