From 16123f5ad5ec08257ba97e1def23db90ce9062f7 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 7 Nov 2015 00:22:26 +0100
Subject: [PATCH 1/2] Check for ImageMagick and for GIF support

---
 mod/install.php | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/mod/install.php b/mod/install.php
index 182495d258..db8f730714 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -1,4 +1,5 @@
 <?php
+require_once "include/Photo.php";
 
 $install_wizard_pass=1;
 
@@ -84,15 +85,15 @@ function install_post(&$a) {
 				'$phpath' => $phpath,
 				'$adminmail' => $adminmail
 			));
-			
+
 
 			$result = file_put_contents('.htconfig.php', $txt);
 			if(! $result) {
 				$a->data['txt'] = $txt;
 			}
-			
+
 			$errors = load_database($db);
-			
+
 
 			if($errors)
 				$a->data['db_failed'] = $errors;
@@ -177,6 +178,8 @@ function install_content(&$a) {
 
 			check_funcs($checks);
 
+			check_imagik($checks);
+
 			check_htconfig($checks);
 
 			check_smarty3($checks);
@@ -428,8 +431,8 @@ function check_funcs(&$checks) {
 		$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
 	}
 
-	
-	
+
+
 	$checks = array_merge($checks, $ck_funcs);
 
 	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
@@ -490,6 +493,23 @@ function check_htaccess(&$checks) {
 	}
 }
 
+function check_imagik(&$checks) {
+	$imagick = false;
+	$gif = false;
+
+	if (class_exists('Imagick')) {
+		$imagick = true;
+		$supported = Photo::supportedTypes();
+		if (array_key_exists('image/gif', $supported)) {
+			$gif = true;
+		}
+	}
+	check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
+	if ($imagick) {
+		check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
+	}
+}
+
 
 function manual_config(&$a) {
 	$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');

From 6befca288f5094bab9c983134c21b168d9358fae Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 7 Nov 2015 11:03:08 +0100
Subject: [PATCH 2/2] Check for mcrypt_create_iv() for RINO2, update link to
 cron documentation

---
 mod/install.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/mod/install.php b/mod/install.php
index db8f730714..e30c306893 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -324,7 +324,7 @@ function check_php(&$phpath, &$checks) {
 	$help = "";
 	if(!$passed) {
 		$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
-		$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>") . EOL ;
+		$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL ;
 		$help .= EOL . EOL ;
 		$tpl = get_markup_template('field_input.tpl');
 		$help .= replace_macros($tpl, array(
@@ -431,10 +431,21 @@ function check_funcs(&$checks) {
 		$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
 	}
 
-
-
 	$checks = array_merge($checks, $ck_funcs);
 
+	// check for 'mcrypt_create_iv()', needed for RINO2
+	if ($ck_funcs[5]['status']) {
+		if (function_exists('mcrypt_create_iv')) {
+			$__status = true;
+			$__help = "If you are using php_cli, please make sure that mcrypt module is enabled in its config file";
+		} else {
+			$__status = false;
+			$__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.');
+		}
+		check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help);
+	}
+
+
 	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
 		notice( t('Please see the file "INSTALL.txt".') . EOL);*/
 }
@@ -511,6 +522,7 @@ function check_imagik(&$checks) {
 }
 
 
+
 function manual_config(&$a) {
 	$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
 	$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');