MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1282 from fabrixxm/remove-eval

Browse source 
remove `util/typohelper.php` and call `php -l` in `util/typo.php` to
This commit is contained in:
Michael Vogel 2015-01-05 14:32:53 +01:00
parent 167bdd7a94 6c66ebf806
commit d35b13fb58
2 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
util/typo.php
View file

@ -12,25 +12,28 @@
$a = new App(); $a = new App();
if(x($a->config,'php_path'))
$phpath = $a->config['php_path'];
else
$phpath = 'php';
echo "Directory: mod\n"; echo "Directory: mod\n";
$files = glob('mod/*.php'); $files = glob('mod/*.php');
foreach($files as $file) { foreach($files as $file) {
echo $file . "\n"; passthru("$phpath -l $file", $ret); $ret===0 or die();
include_once($file);
} }
echo "Directory: include\n"; echo "Directory: include\n";
$files = glob('include/*.php'); $files = glob('include/*.php');
foreach($files as $file) { foreach($files as $file) {
echo $file . "\n"; passthru("$phpath -l $file", $ret); $ret===0 or die();
include_once($file);
} }
echo "Directory: object\n"; echo "Directory: object\n";
$files = glob('object/*.php'); $files = glob('object/*.php');
foreach($files as $file) { foreach($files as $file) {
echo $file . "\n"; passthru("$phpath -l $file", $ret); $ret===0 or die();
include_once($file);
} }
echo "Directory: addon\n"; echo "Directory: addon\n";
@ -40,26 +43,17 @@
$addon = basename($dir); $addon = basename($dir);
$files = glob($dir . '/' . $addon . '.php'); $files = glob($dir . '/' . $addon . '.php');
foreach($files as $file) { foreach($files as $file) {
echo $file . "\n"; passthru("$phpath -l $file", $ret); $ret===0 or die();
include_once($file);
} }
} }
if(x($a->config,'php_path'))
$phpath = $a->config['php_path'];
else
$phpath = 'php';
echo "String files\n"; echo "String files\n";
echo 'util/strings.php' . "\n"; echo 'util/strings.php' . "\n";
include_once('util/strings.php'); passthru("$phpath -l util/strings.php", $ret); $ret===0 or die();
echo count($a->strings) . ' strings' . "\n";
$files = glob('view/*/strings.php'); $files = glob('view/*/strings.php');
foreach($files as $file) { foreach($files as $file) {
echo $file . "\n"; passthru("$phpath -l $file", $ret); $ret===0 or die();
passthru($phpath . ' util/typohelper.php ' . $file);
// include_once($file);
} }

11
util/typohelper.php
View file

@ -1,11 +0,0 @@
<?php
$str = <<< EOT
error_reporting(E_ERROR | E_WARNING | E_PARSE );
ini_set('display_errors', '1');
ini_set('log_errors','0');
EOT;
$str .= str_replace('<?php', '', file_get_contents($argv[1]));
eval($str);