Merge remote-tracking branch 'friendika/master' into newacl

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 66908b8d344eacf93686f40e161ba7fa688ccc27..9c55f15cf554f4acfc66bca388b59e2ff30e59ba 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1074 );
+define( 'UPDATE_VERSION' , 1076 );
 
 /**
  *
@@ -590,3 +590,37 @@ function update_1073() {
        q("ALTER TABLE `contact` ADD `remote_self` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `self` ");
 }
 
+function update_1074() {
+       q("ALTER TABLE `user` ADD `hidewall` TINYINT( 1) NOT NULL DEFAULT '0' AFTER `blockwall` ");
+       $r = q("SELECT `uid` FROM `profile` WHERE `is-default` = 1 AND `hidewall` = 1");
+       if(count($r)) {
+               foreach($r as $rr)
+                       q("UPDATE `user` SET `hidewall` = 1 WHERE `uid` = %d LIMIT 1",
+                               intval($rr['uid'])
+                       );
+       }
+       q("ALTER TABLE `profile` DROP `hidewall`");
+}
+
+function update_1075() {
+       q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` ");
+       $r = q("SELECT `uid` FROM `user` WHERE 1");
+       if(count($r)) {
+               foreach($r as $rr) {
+                       $found = true;
+                       do {
+                               $guid = substr(random_string(),0,16);
+                               $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
+                                       dbesc($guid)
+                               );
+                               if(! count($x))
+                                       $found = false;
+                       } while ($found == true );
+
+                       q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d LIMIT 1",
+                               dbesc($guid),
+                               intval($rr['uid'])
+                       );
+               }
+       }
+}
\ No newline at end of file