more social graph stuff

diff --git a/boot.php b/boot.php
index 2a5b7a71ae4477af2461d26ca83b5665fc9427ad..5258a9d63ff123a0b24364363fa0ef1f2df4f1ed 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDIKA_PLATFORM',     'Friendica');
 define ( 'FRIENDIKA_VERSION',      '2.3.1152' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1100      );
+define ( 'DB_UPDATE_VERSION',      1101      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 02701b740c79572203dd4ee7726c2b7e473fc0bb..eeb3700ff97504853cfd9a7f7b381ab7afb1b4f8 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -66,6 +66,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `issued-id` char(255) NOT NULL,
   `dfrn-id` char(255) NOT NULL,
   `url` char(255) NOT NULL,
+  `nurl` char(255) NOT NULL,
   `addr` char(255) NOT NULL,
   `alias` char(255) NOT NULL,
   `pubkey` text NOT NULL,
@@ -106,6 +107,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   KEY `nick` (`nick`),
   KEY `attag` (`attag`),
   KEY `url` (`url`),
+  KEY `nurl` (`nurl`),
   KEY `addr` (`addr`),
   KEY `batch` (`batch`),
   KEY `issued-id` (`issued-id`),

diff --git a/include/diaspora.php b/include/diaspora.php
index ccfa799adc13ecf77d59f841fa55efc4adafc782..f362a34789733d36e75c301735352b9e6a642c07 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -451,13 +451,14 @@ function diaspora_request($importer,$xml) {
 
        $batch = (($ret['batch']) ? $ret['batch'] : implode('/', array_slice(explode('/',$ret['url']),0,3)) . '/receive/public');
 
-       $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
-               VALUES ( %d, '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
+       $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
+               VALUES ( %d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
                intval($importer['uid']),
                dbesc($ret['network']),
                dbesc($ret['addr']),
                datetime_convert(),
                dbesc($ret['url']),
+               dbesc(normalise_link($ret['url'])),
                dbesc($batch),
                dbesc($ret['name']),
                dbesc($ret['nick']),

diff --git a/include/items.php b/include/items.php
index 1b4b52491106e934f018b6657b23753ac0ce17e3..ad121bbf5f2c26b931f99903c64bb06e495b93f7 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2388,12 +2388,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
        
                // create contact record
 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`, 
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, 
                        `blocked`, `readonly`, `pending`, `writable` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
                        intval($importer['uid']),
                        dbesc(datetime_convert()),
                        dbesc($url),
+                       dbesc(normalise_link($url)),
                        dbesc($name),
                        dbesc($nick),
                        dbesc($photo),

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index af4a5aece50fb013eedc18dbdd1684e0567eb3ac..9755895ced0220cb398342798a0256f1dbab10c2 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -142,12 +142,13 @@ function dfrn_request_post(&$a) {
                                         * Create a contact record on our site for the other person
                                         */
 
-                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `nick`, `photo`, `site-pubkey`,
+                                       $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
                                                `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`) 
-                                               VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+                                               VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
                                                intval(local_user()),
                                                datetime_convert(),
                                                dbesc($dfrn_url),
+                                               dbesc(normalise_link($dfrn_url)),
                                                $parms['fn'],
                                                $parms['nick'],
                                                $parms['photo'],
@@ -371,12 +372,13 @@ function dfrn_request_post(&$a) {
 
 
                                dbesc_array($parms);
-                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
+                               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`,`name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
                                        `request`, `confirm`, `notify`, `poll`, `poco`, `network` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
                                        intval($uid),
-                                       datetime_convert(),
+                                       dbesc(datetime_convert()),
                                        $parms['url'],
+                                       dbesc(normalise_link($parms['url'])),
                                        $parms['fn'],
                                        $parms['nick'],
                                        $parms['issued-id'],

diff --git a/mod/follow.php b/mod/follow.php
index 4328e7fe043a3aaeb3f92cedd09f6d62402f7d5b..0329d1eee6195fbf99fd6c626bbd20feb430045d 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -100,12 +100,13 @@ function follow_post(&$a) {
                        $new_relation = CONTACT_IS_FOLLOWER;
 
                // create contact record 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
                        `writable`, `blocked`, `readonly`, `pending` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
                        intval(local_user()),
                        dbesc(datetime_convert()),
                        dbesc($ret['url']),
+                       dbesc(normalise_link($ret['url'])),
                        dbesc($ret['addr']),
                        dbesc($ret['alias']),
                        dbesc($ret['batch']),

diff --git a/mod/register.php b/mod/register.php
index 85e1f9faa098b6af371e408e4f3b8677982acbfa..6ebe35dbfd35c8886bc683470f56d3b8a998a98a 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -268,9 +268,9 @@ function register_post(&$a) {
                                intval($newuid));
                        return;
                }
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`,
-                       `request`, `notify`, `poll`, `confirm`, `name-date`, `uri-date`, `avatar-date` )
-                       VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
+                       `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date` )
+                       VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
                        intval($newuid),
                        datetime_convert(),
                        dbesc($username),
@@ -279,10 +279,12 @@ function register_post(&$a) {
                        dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
                        dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
                        dbesc($a->get_baseurl() . "/profile/$nickname"),
+                       dbesc(normalise_link($a->get_baseurl() . "/profile/$nickname")),
                        dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
                        dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
                        dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
                        dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
+                       dbesc($a->get_baseurl() . "/poco/$nickname"),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert())

diff --git a/update.php b/update.php
index aa78c3c2e6fb1da4444f4ba7022b505cd5e55f21..cdadb2e38872d0acbaf000917e74f5c3da8a3af1 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1100 );
+define( 'UPDATE_VERSION' , 1101 );
 
 /**
  *
@@ -846,6 +846,22 @@ function update_1099() {
 
 }
 
+function update_1100() {
+       q("ALTER TABLE `contact` ADD `nurl` CHAR( 255 ) NOT NULL AFTER `url` ");
+       q("alter table contact add index (`nurl`) ");
+
+       require_once('include/text.php');
+
+       $r = q("select id, url from contact where url != '' and nurl = '' ");
+       if(count($r)) {
+               foreach($r as $rr) {
+                       q("update contact set nurl = '%s' where id = %d limit 1",
+                               dbesc(normalise_link($rr['url'])),
+                               intval($rr['id'])
+                       ); 
+               }
+       }
+}