From ce51807daa26d1b675a611a15130fa55417b1cc5 Mon Sep 17 00:00:00 2001 From: Tiago Hillebrandt Date: Sun, 9 Aug 2015 16:48:14 -0500 Subject: [PATCH 1/2] Verifies if exec is not in disable_functions directive --- lib/cli/Shell.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cli/Shell.php b/lib/cli/Shell.php index 633b958..0ea4550 100755 --- a/lib/cli/Shell.php +++ b/lib/cli/Shell.php @@ -37,7 +37,7 @@ static public function columns() { break; } } - } else { + } else if ( !preg_match( "/(^|,)(\s*)?exec(\s*)?(,|$)/", ini_get( "disable_functions" ) ) ) { $columns = (int) exec('/usr/bin/env tput cols'); } From 6b8616010a0bada83bc79df303e583eb28e12a15 Mon Sep 17 00:00:00 2001 From: Tiago Hillebrandt Date: Sun, 9 Aug 2015 16:56:19 -0500 Subject: [PATCH 2/2] Update fix coding style --- lib/cli/Shell.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cli/Shell.php b/lib/cli/Shell.php index 0ea4550..1adee79 100755 --- a/lib/cli/Shell.php +++ b/lib/cli/Shell.php @@ -37,7 +37,7 @@ static public function columns() { break; } } - } else if ( !preg_match( "/(^|,)(\s*)?exec(\s*)?(,|$)/", ini_get( "disable_functions" ) ) ) { + } else if (!preg_match('/(^|,)(\s*)?exec(\s*)?(,|$)/', ini_get('disable_functions'))) { $columns = (int) exec('/usr/bin/env tput cols'); }