X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=9c509be4b7a4ee5e1876affea8ad44b4942d44d1;hb=c9ea18ce7499cc70b16e27050c118e1f5e03831c;hp=d54063ba74f98ca4816e65bd3bff52fcb8ee8007;hpb=09851331a9dc8601919cd0c9200686b92843d235;p=friendica.git

diff --git a/update.php b/update.php
index d54063ba74..9c509be4b7 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1216);
+define('UPDATE_VERSION' , 1225);
 
 /**
  *
@@ -37,7 +37,7 @@ define('UPDATE_VERSION' , 1216);
  */
 
 
-/// @TODO These old updates need to have UPDATE_SUCCESS returned on success?
+
 function update_1000() {
 
 	q("ALTER TABLE `item` DROP `like`, DROP `dislike` ");
@@ -157,15 +157,14 @@ function update_1014() {
 	$r = q("SELECT * FROM `contact` WHERE 1");
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
-			if (stristr($rr['thumb'],'avatar')) {
+			if(stristr($rr['thumb'],'avatar'))
 				q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d",
 					dbesc(str_replace('avatar','micro',$rr['thumb'])),
 					intval($rr['id']));
-			} else {
+			else
 				q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d",
 					dbesc(str_replace('5.jpg','6.jpg',$rr['thumb'])),
 					intval($rr['id']));
-			}
 		}
 	}
 }
@@ -327,22 +326,23 @@ function update_1032() {
 
 function update_1033() {
 	q("CREATE TABLE IF NOT EXISTS `cache` (
- 		`k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
- 		`v` TEXT NOT NULL,
- 		`updated` DATETIME NOT NULL
-		) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+		`k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
+		`v` TEXT NOT NULL,
+		`updated` DATETIME NOT NULL
+		) DEFAULT CHARSET=utf8 ");
 }
 
 
 function update_1034() {
 
-	// If you have any of these parent-less posts they can cause problems, and
-	// we need to delete them. You can't see them anyway.
-	// Legitimate items will usually get re-created on the next
-	// pull from the hub.
-	// But don't get rid of a post that may have just come in
-	// and may not yet have the parent id set.
-
+	/*
+	 * If you have any of these parent-less posts they can cause problems, and
+	 * we need to delete them. You can't see them anyway.
+	 * Legitimate items will usually get re-created on the next
+	 * pull from the hub.
+	 * But don't get rid of a post that may have just come in
+	 * and may not yet have the parent id set.
+	 */
 	q("DELETE FROM `item` WHERE `parent` = 0 AND `created` < UTC_TIMESTAMP() - INTERVAL 2 MINUTE");
 
 }
@@ -369,11 +369,13 @@ function update_1036() {
 }
 
 function update_1037() {
+
 	q("ALTER TABLE `contact` CHANGE `lrdd` `alias` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ");
+
 }
 
 function update_1038() {
-	q("ALTER TABLE `item` ADD `plink` CHAR( 255 ) NOT NULL AFTER `target` ");
+ q("ALTER TABLE `item` ADD `plink` CHAR( 255 ) NOT NULL AFTER `target` ");
 }
 
 function update_1039() {
@@ -530,12 +532,9 @@ function update_1065() {
 }
 
 function update_1066() {
-	$r = q("ALTER TABLE `item` ADD `received` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `edited` ");
-
-	/// @TODO Decide to use dbm::is_result() here, what does $r include?
-	if ($r) {
+	$r = q("ALTER TABLE `item` ADD `received` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `edited` ");
+	if($r)
 		q("ALTER TABLE `item` ADD INDEX ( `received` ) ");
-	}
 
 	$r = q("UPDATE `item` SET `received` = `edited` WHERE 1");
 }
@@ -597,11 +596,10 @@ 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 (dbm::is_result($r)) {
-		foreach ($r as $rr) {
+		foreach($r as $rr)
 			q("UPDATE `user` SET `hidewall` = 1 WHERE `uid` = %d",
 				intval($rr['uid'])
 			);
-		}
 	}
 	q("ALTER TABLE `profile` DROP `hidewall`");
 }
@@ -617,9 +615,8 @@ function update_1075() {
 				$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
 					dbesc($guid)
 				);
-				if (!dbm::is_result($x)) {
+				if(! count($x))
 					$found = false;
-				}
 			} while ($found == true );
 
 			q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",
@@ -688,19 +685,14 @@ function update_1082() {
 	q("ALTER TABLE `photo` ADD `guid` CHAR( 64 ) NOT NULL AFTER `contact-id`,
 		ADD INDEX ( `guid` )  ");
 	// make certain the following code is only executed once
-
-	$r = q("SELECT `id` FROM `photo` WHERE `guid` != '' LIMIT 1");
-
-	if (dbm::is_result($r)) {
+	$r = q("select `id` from `photo` where `guid` != '' limit 1");
+	if (dbm::is_result($r))
 		return;
-	}
-
 	$r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
-
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			$guid = get_guid();
-			q("UPDATE `photo` SET `guid` = '%s' WHERE `resource-id` = '%s'",
+			q("update `photo` set `guid` = '%s' where `resource-id` = '%s'",
 				dbesc($guid),
 				dbesc($rr['resource-id'])
 			);
@@ -745,13 +737,11 @@ function update_1087() {
 			$x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1",
 				intval($rr['id'])
 			);
-
-			if (dbm::is_result($x)) {
+			if(count($x))
 				q("UPDATE `item` SET `commented` = '%s' WHERE `id` = %d",
 					dbesc($x[0]['cdate']),
 					intval($rr['id'])
 				);
-			}
 		}
 	}
 }
@@ -860,14 +850,14 @@ 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`) ");
+	q("alter table contact add index (`nurl`) ");
 
 	require_once('include/text.php');
 
-	$r = q("SELECT `id`, `url` FROM `contact` WHERE `url` != '' AND `nurl` = '' ");
+	$r = q("select id, url from contact where url != '' and nurl = '' ");
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
-			q("UPDATE `contact` SET `nurl` = '%s' WHERE `id` = %d",
+			q("update contact set nurl = '%s' where id = %d",
 				dbesc(normalise_link($rr['url'])),
 				intval($rr['id'])
 			);
@@ -897,7 +887,6 @@ function update_1102() {
 
 
 function update_1103() {
-/// @TODO Commented out:
 //	q("ALTER TABLE `item` ADD INDEX ( `wall` ) ");
 	q("ALTER TABLE `item` ADD FULLTEXT ( `tag` ) ");
 	q("ALTER TABLE `contact` ADD INDEX ( `pending` ) ");
@@ -1043,11 +1032,9 @@ function update_1120() {
 
 	$r = q("describe item");
 	if (dbm::is_result($r)) {
-		foreach ($r as $rr) {
-			if ($rr['Field'] == 'spam') {
+		foreach($r as $rr)
+			if($rr['Field'] == 'spam')
 				return;
-			}
-		}
 	}
 	q("ALTER TABLE `item` ADD `spam` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` , ADD INDEX (`spam`) ");
 
@@ -1081,16 +1068,16 @@ function update_1121() {
 }
 
 function update_1122() {
-	q("ALTER TABLE `notify` ADD `hash` CHAR( 64 ) NOT NULL AFTER `id` ,
+q("ALTER TABLE `notify` ADD `hash` CHAR( 64 ) NOT NULL AFTER `id` ,
 ADD INDEX ( `hash` ) ");
 }
 
 function update_1123() {
-	set_config('system','allowed_themes','dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr');
+set_config('system','allowed_themes','dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr');
 }
 
 function update_1124() {
-	q("ALTER TABLE `item` ADD INDEX (`author-name`) ");
+q("alter table item add index (`author-name`) ");
 }
 
 function update_1125() {
@@ -1102,7 +1089,7 @@ function update_1125() {
   `receiver-uid` INT NOT NULL,
   INDEX ( `master-parent-item` ),
   INDEX ( `receiver-uid` )
-  ) DEFAULT CHARSET=utf8");
+  ) ENGINE = MyISAM DEFAULT CHARSET=utf8");
 }
 
 function update_1126() {
@@ -1121,12 +1108,12 @@ function update_1127() {
   INDEX ( `spam` ),
   INDEX ( `ham` ),
   INDEX ( `term` )
-  ) DEFAULT CHARSET=utf8");
+  ) ENGINE = MyISAM DEFAULT CHARSET=utf8");
 }
 
 
 function update_1128() {
-	q("ALTER TABLE `spam` ADD `date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `term` ");
+	q("alter table spam add `date` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `term` ");
 }
 
 function update_1129() {
@@ -1147,14 +1134,14 @@ function update_1132() {
 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 `username` CHAR( 255 ) NOT NULL,
 INDEX ( `username` )
-) ");
+) ENGINE = MYISAM ");
 
 }
 
 function update_1133() {
-	q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
-	q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
-	q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
+q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
+q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
+q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
 }
 
 function update_1134() {
@@ -1181,38 +1168,38 @@ function update_1136() {
 
 	// order in reverse so that we save the newest entry
 
-	$r = q("SELECT * FROM `config` WHERE 1 ORDER BY `id` DESC");
+	$r = q("select * from config where 1 order by id desc");
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			$found = false;
-			foreach ($arr as $x) {
-				if ($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+			foreach($arr as $x) {
+				if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
 					$found = true;
-					q("DELETE FROM `config` WHERE `id` = %d",
+					q("delete from config where id = %d",
 						intval($rr['id'])
 					);
 				}
 			}
-			if (! $found) {
+			if(! $found) {
 				$arr[] = $rr;
 			}
 		}
 	}
 
 	$arr = array();
-	$r = q("SELECT * FROM `pconfig` WHERE 1 ORDER BY `id` DESC");
+	$r = q("select * from pconfig where 1 order by id desc");
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			$found = false;
-			foreach ($arr as $x) {
-				if ($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+			foreach($arr as $x) {
+				if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
 					$found = true;
-					q("DELETE FROM `pconfig` WHERE `id` = %d",
+					q("delete from pconfig where id = %d",
 						intval($rr['id'])
 					);
 				}
 			}
-			if (! $found) {
+			if(! $found) {
 				$arr[] = $rr;
 			}
 		}
@@ -1224,153 +1211,114 @@ function update_1136() {
 
 
 function update_1137() {
-	q("ALTER TABLE `item_id` DROP `face` , DROP `dspr` , DROP `twit` , DROP `stat` ");
-	q("ALTER TABLE `item_id` ADD `sid` CHAR( 255 ) NOT NULL AFTER `uid` , ADD `service` CHAR( 255 ) NOT NULL AFTER `sid` , ADD INDEX (`sid`), ADD INDEX ( `service`) ");
+	q("alter table item_id DROP `face` , DROP `dspr` , DROP `twit` , DROP `stat` ");
+	q("ALTER TABLE `item_id` ADD `sid` CHAR( 255 ) NOT NULL AFTER `uid` , ADD `service` CHAR( 255 ) NOT NULL AFTER `sid` , add index (`sid`), add index ( `service`) ");
 }
 
 function update_1138() {
-	q("ALTER TABLE `contact` ADD `archive` TINYINT(1) NOT NULL DEFAULT '0' AFTER `hidden`, ADD INDEX (`archive`)");
+	q("alter table contact add archive tinyint(1) not null default '0' after hidden, add index (archive)");
 }
 
 function update_1139() {
-	$r = q("ALTER TABLE `user` ADD `account_removed` TINYINT(1) NOT NULL DEFAULT '0' AFTER `expire`, ADD INDEX(`account_removed`)");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table user add account_removed tinyint(1) not null default '0' after expire, add index(account_removed) ");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1140() {
-	$r = q("ALTER TABLE `addon` ADD `hidden` TINYINT(1) NOT NULL DEFAULT '0' AFTER `installed`, ADD INDEX(`hidden`) ");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table addon add hidden tinyint(1) not null default '0' after installed, add index(hidden) ");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1141() {
-	$r = q("ALTER TABLE `glink` ADD `zcid` INT(11) NOT NULL AFTER `gcid`, ADD INDEX(`zcid`) ");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table glink add zcid int(11) not null after gcid, add index(zcid) ");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 
 function update_1142() {
-	$r = q("ALTER TABLE `user` ADD `service_class` CHAR(32) NOT NULL AFTER `expire_notification_sent`, ADD INDEX(`service_class`) ");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table user add service_class char(32) not null after expire_notification_sent, add index(service_class) ");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1143() {
-	$r = q("ALTER TABLE `user` ADD `def_gid` INT(11) NOT NULL DEFAULT '0' AFTER `service_class`");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table user add def_gid int(11) not null default '0' after service_class");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1144() {
-	$r = q("ALTER TABLE `contact` ADD `prv` TINYINT(1) NOT NULL DEFAULT '0' AFTER `forum`");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table contact add prv tinyint(1) not null default '0' after forum");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1145() {
-	$r = q("ALTER TABLE `profile` ADD `howlong` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `with`");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table profile add howlong datetime not null default '0001-01-01 00:00:00' after `with`");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1146() {
-	$r = q("ALTER TABLE `profile` ADD `hometown` CHAR(255) NOT NULL AFTER `country-name`, ADD INDEX ( `hometown` ) ");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("alter table profile add hometown char(255) not null after `country-name`, add index ( `hometown` ) ");
+	if(! $r)
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1147() {
 	$r1 = q("ALTER TABLE `sign` ALTER `iid` SET DEFAULT '0'");
 	$r2 = q("ALTER TABLE `sign` ADD `retract_iid` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `iid`");
 	$r3 = q("ALTER TABLE `sign` ADD INDEX ( `retract_iid` )");
-
-	if ($r1 && $r2 && $r3) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	if((! $r1) || (! $r2) || (! $r3))
+		return UPDATE_FAILED ;
+	return UPDATE_SUCCESS ;
 }
 
 function update_1148() {
-	$r = q("ALTER TABLE `photo` ADD `type` CHAR(128) NOT NULL DEFAULT 'image/jpeg' AFTER `filename`");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("ALTER TABLE photo ADD type CHAR(128) NOT NULL DEFAULT 'image/jpeg' AFTER filename");
+	if (!$r)
+		return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 
 function update_1149() {
-	$r1 = q("ALTER TABLE `profile` ADD `likes` TEXT NOT NULL AFTER `prv_keywords`");
-	$r2 = q("ALTER TABLE `profile` ADD `dislikes` TEXT NOT NULL AFTER `likes`");
-
-	if ($r1 && $r2) {
-		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
+	$r1 = q("ALTER TABLE profile ADD likes text NOT NULL after prv_keywords");
+	$r2 = q("ALTER TABLE profile ADD dislikes text NOT NULL after likes");
+	if (! ($r1 && $r2))
+		return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 
 function update_1150() {
-	$r = q("ALTER TABLE `event` ADD `summary` TEXT NOT NULL AFTER `finish`, ADD INDEX ( `uid` ), ADD INDEX ( `cid` ), ADD INDEX ( `uri` ), ADD INDEX ( `start` ), ADD INDEX ( `finish` ), ADD INDEX ( `type` ), ADD INDEX ( `adjust` ) ");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("ALTER TABLE event ADD summary text NOT NULL after finish, add index ( uid ), add index ( cid ), add index ( uri ), add index ( `start` ), add index ( finish ), add index ( `type` ), add index ( adjust ) ");
+	if(! $r)
+		return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 
 function update_1151() {
-	$r = q("CREATE TABLE IF NOT EXISTS `locks` (
-			`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-			`name` CHAR( 128 ) NOT NULL ,
-			`locked` TINYINT( 1 ) NOT NULL DEFAULT '0'
-		  ) DEFAULT CHARSET=utf8 ");
-
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	$r = q("CREATE TABLE IF NOT EXISTS locks (
+			id INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+			name CHAR( 128 ) NOT NULL ,
+			locked TINYINT( 1 ) NOT NULL DEFAULT '0'
+		  ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+	if (!$r)
+		return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1152() {
@@ -1385,33 +1333,24 @@ function update_1152() {
 		KEY `otype` ( `otype` ),
 		KEY `type`  ( `type` ),
 		KEY `term`  ( `term` )
-		) DEFAULT CHARSET=utf8 ");
-
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
+		) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+	if (!$r)
+		return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1153() {
 	$r = q("ALTER TABLE `hook` ADD `priority` INT(11) UNSIGNED NOT NULL DEFAULT '0'");
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
+	if(!$r) return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1154() {
 	$r = q("ALTER TABLE `event` ADD `ignore` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `adjust` , ADD INDEX ( `ignore` )");
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
+	if(!$r) return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1155() {
@@ -1419,9 +1358,8 @@ function update_1155() {
 	$r2 = q("ALTER TABLE `item_id` ADD `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
 	$r3 = q("ALTER TABLE `item_id` ADD INDEX ( `iid` ) ");
 
-	if ($r1 && $r2 && $r3) {
+	if($r1 && $r2 && $r3)
 		return UPDATE_SUCCESS;
-	}
 
 	return UPDATE_FAILED;
 }
@@ -1430,15 +1368,12 @@ function update_1156() {
 	$r = q("ALTER TABLE `photo` ADD `datasize` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `width` ,
 ADD INDEX ( `datasize` ) ");
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
+	if(!$r) return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1157() {
-	$r = q("CREATE TABLE IF NOT EXISTS `dsprphotoq` (
+	$r = q("CREATE TABLE  IF NOT EXISTS `dsprphotoq` (
 	  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
 	  `uid` int(11) NOT NULL,
 	  `msg` mediumtext NOT NULL,
@@ -1447,11 +1382,8 @@ function update_1157() {
 	  ) ENGINE=MyISAM DEFAULT CHARSET=utf8"
 	);
 
-	if ($r) {
+	if($r)
 		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
 }
 
 function update_1158() {
@@ -1464,9 +1396,8 @@ function update_1158() {
 	$r = q("CREATE INDEX event_id ON item(`event-id`)");
 	set_config('system', 'maintenance', 0);
 
-	if ($r) {
+	if($r)
 		return UPDATE_SUCCESS;
-	}
 
 	return UPDATE_FAILED;
 }
@@ -1477,11 +1408,10 @@ function update_1159() {
 		ADD INDEX (`uid`),
 		ADD INDEX (`aid`)");
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
+	if(!$r)
+		return UPDATE_FAILED;
 
-	return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1160() {
@@ -1494,21 +1424,19 @@ function update_1160() {
 	$r = q("ALTER TABLE `item` ADD `mention` TINYINT(1) NOT NULL DEFAULT '0', ADD INDEX (`mention`)");
 	set_config('system', 'maintenance', 0);
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
+	if(!$r)
+		return UPDATE_FAILED;
 
-	return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1161() {
 	$r = q("ALTER TABLE `pconfig` ADD INDEX (`cat`)");
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
+	if(!$r)
+		return UPDATE_FAILED;
 
-	return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1162() {
@@ -1524,12 +1452,10 @@ function update_1163() {
 	$r = q("ALTER TABLE `item` ADD `network` char(32) NOT NULL");
 
 	set_config('system', 'maintenance', 0);
+	if(!$r)
+		return UPDATE_FAILED;
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 function update_1164() {
 	set_config('system', 'maintenance', 1);
@@ -1586,21 +1512,19 @@ function update_1164() {
 
 function update_1165() {
 	$r = q("CREATE TABLE IF NOT EXISTS `push_subscriber` (
-	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	`uid` INT NOT NULL,
-	`callback_url` CHAR( 255 ) NOT NULL,
-	`topic` CHAR( 255 ) NOT NULL,
-	`nickname` CHAR( 255 ) NOT NULL,
-	`push` INT NOT NULL,
-	`last_update` DATETIME NOT NULL,
-	`secret` CHAR( 255 ) NOT NULL
-	) DEFAULT CHARSET=utf8 ");
-
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
+			`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+		    `uid` INT NOT NULL,
+	        `callback_url` CHAR( 255 ) NOT NULL,
+            `topic` CHAR( 255 ) NOT NULL,
+            `nickname` CHAR( 255 ) NOT NULL,
+            `push` INT NOT NULL,
+            `last_update` DATETIME NOT NULL,
+            `secret` CHAR( 255 ) NOT NULL
+		  ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+	if (!$r)
+		return UPDATE_FAILED;
 
-	return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1166() {
@@ -1611,33 +1535,27 @@ function update_1166() {
 			`name` CHAR(255) NOT NULL,
 			`avatar` CHAR(255) NOT NULL,
 			INDEX (`url`)
-		) DEFAULT CHARSET=utf8 ");
-
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
+		  ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+	if (!$r)
+		return UPDATE_FAILED;
 
-	return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1167() {
 	$r = q("ALTER TABLE `contact` ADD `notify_new_posts` TINYINT(1) NOT NULL DEFAULT '0'");
+	if (!$r)
+		return UPDATE_FAILED;
 
-	if ($r) {
-		return UPDATE_SUCCESS;
-	}
-
-	return UPDATE_FAILED;
+	return UPDATE_SUCCESS;
 }
 
 function update_1168() {
 	$r = q("ALTER TABLE `contact` ADD `fetch_further_information` TINYINT(1) NOT NULL DEFAULT '0'");
+	if (!$r)
+		return UPDATE_FAILED;
 
-	if ($r) {
-		return UPDATE_SUCCESS ;
-	}
-
-	return UPDATE_FAILED ;
+	return UPDATE_SUCCESS;
 }
 
 function update_1169() {
@@ -1675,10 +1593,8 @@ function update_1169() {
 		  KEY `uid_created` (`uid`,`created`),
 		  KEY `uid_commented` (`uid`,`commented`)
 		) ENGINE=MyISAM  DEFAULT CHARSET=utf8;");
-
-	if (!$r) {
+	if (!$r)
 		return UPDATE_FAILED;
-	}
 
 	proc_run(PRIORITY_LOW, "include/threadupdate.php");
 
@@ -1784,22 +1700,19 @@ function update_1190() {
 			$key = $rr['k'];
 			$value = $rr['v'];
 
-			if ($key === 'randomise') {
+			if ($key === 'randomise')
 				del_pconfig($uid,$family,$key);
-			}
 
 			if ($key === 'show_on_profile') {
-				if ($value) {
+				if ($value)
 					set_pconfig($uid,feature,forumlist_profile,$value);
-				}
 
 				del_pconfig($uid,$family,$key);
 			}
 
 			if ($key === 'show_on_network') {
-				if ($value) {
+				if ($value)
 					set_pconfig($uid,feature,forumlist_widget,$value);
-				}
 
 				del_pconfig($uid,$family,$key);
 			}