Merge https://github.com/friendica/red into zpull

7 files changed, 35 insertions, 17 deletions

diff --git a/assets/home.html b/assets/home.html
index 1a0a13481..0ec29832e 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -26,8 +26,8 @@ header { z-index: 10000; }
 <div style="margin-top: 50px;"></div>
 
 <center>
-<div style="color:#808080;font-weight:bold;font-size:4.0em; margin-bottom: 15px;">Dream it. Do it.</div>
-<img style="width: 175px; margin-bottom: 45px;" src="assets/logo_antiprism.png" >
+<div style="color:#808080;font-weight:bold;font-size:4.0em; margin-bottom:75px;">Dream it. Do it.</div>
+<img style="width: 450px; margin-bottom: 95px;" src="assets/logo_simplifiedap.png" >
 </center>
 <div class="tr">
 <div class="td">Communications</div>
diff --git a/assets/logo_antiprism.png b/assets/logo_antiprism.png
deleted file mode 100644
index b72e2a211..000000000
--- a/assets/logo_antiprism.png
+++ /dev/null
diff --git a/assets/logo_simplifiedap.png b/assets/logo_simplifiedap.png
new file mode 100644
index 000000000..a49a9c12a
--- /dev/null
+++ b/assets/logo_simplifiedap.png
diff --git a/assets/redmatrixlogo.png b/assets/redmatrixlogo.png
deleted file mode 100644
index 6929ae14f..000000000
--- a/assets/redmatrixlogo.png
+++ /dev/null
diff --git a/boot.php b/boot.php
index 68b7c8d3c..56a87ca9a 100755
--- a/boot.php
+++ b/boot.php
@@ -47,7 +47,7 @@ define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
 
-define ( 'DB_UPDATE_VERSION',       1098  );
+define ( 'DB_UPDATE_VERSION',       1099  );
 
 define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/install/database.sql b/install/database.sql
index cd31a0285..ac35f9bc3 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -160,18 +160,18 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_allow_gid` mediumtext NOT NULL,
   `channel_deny_cid` mediumtext NOT NULL,
   `channel_deny_gid` mediumtext NOT NULL,
-  `channel_r_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_r_profile` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_r_photos` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_r_abook` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_w_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_w_wall` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_w_tagwall` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_w_comment` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_w_mail` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_w_photos` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_w_chat` tinyint(3) unsigned NOT NULL DEFAULT '128',
-  `channel_a_delegate` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '128',
+  `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
   `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128',
   `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128',
   `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128',
diff --git a/install/update.php b/install/update.php
index 7d1305863..9ad74fec4 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1098 );
+define( 'UPDATE_VERSION' , 1099 );
 
 /**
  *
@@ -1099,4 +1099,22 @@ function update_r1097() {
 	}
 	return UPDATE_SUCCESS;
 	
-}
\ No newline at end of file
+}
+
+function update_r1098() {
+	$r = q("ALTER TABLE `channel` CHANGE `channel_r_stream` `channel_r_stream` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r2 = q("ALTER TABLE `channel` CHANGE `channel_r_profile` `channel_r_profile` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r3 = q("ALTER TABLE `channel` CHANGE `channel_r_photos` `channel_r_photos` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r4 = q("ALTER TABLE `channel` CHANGE `channel_r_abook` `channel_r_abook` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r4 = q("ALTER TABLE `channel` CHANGE `channel_w_stream` `channel_w_stream` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r5 = q("ALTER TABLE `channel` CHANGE `channel_w_wall` `channel_w_wall` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r6 = q("ALTER TABLE `channel` CHANGE `channel_w_tagwall` `channel_w_tagwall` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r7 = q("ALTER TABLE `channel` CHANGE `channel_w_comment` `channel_w_comment` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r8 = q("ALTER TABLE `channel` CHANGE `channel_w_mail` `channel_w_mail` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r9 = q("ALTER TABLE `channel` CHANGE `channel_w_photos` `channel_w_photos` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r10 = q("ALTER TABLE `channel` CHANGE `channel_w_chat` `channel_w_chat` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	$r11 = q("ALTER TABLE `channel` CHANGE `channel_a_delegate` `channel_a_delegate` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+	if($r && $r2 && $r3 && $r3 && $r5 && $r6 && $r7 && $r8 && $r9 && $r9 && $r10 && $r11)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}