add email probe logging, limit typo check to main addon files and skip additional support files

This commit is contained in:
friendica 2012-06-05 19:28:04 -07:00
parent ae08d2c49b
commit 5389efffa9
2 changed files with 5 additions and 3 deletions

View file

@ -435,10 +435,13 @@ function probe_url($url, $mode = PROBE_NORMAL) {
$password = ''; $password = '';
openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']); openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
$mbox = email_connect($mailbox,$r[0]['user'],$password); $mbox = email_connect($mailbox,$r[0]['user'],$password);
if(! $mbox)
logger('probe_url: email_connect failed.');
unset($password); unset($password);
} }
if($mbox) { if($mbox) {
$msgs = email_poll($mbox,$orig_url); $msgs = email_poll($mbox,$orig_url);
logger('probe_url: searching ' . $orig_url . ', ' . count($msgs) . ' messages found.', LOGGER_DEBUG);
if(count($msgs)) { if(count($msgs)) {
$addr = $orig_url; $addr = $orig_url;
$network = NETWORK_MAIL; $network = NETWORK_MAIL;

View file

@ -30,11 +30,10 @@
$dirs = glob('addon/*'); $dirs = glob('addon/*');
foreach($dirs as $dir) { foreach($dirs as $dir) {
$files = glob($dir . '/*.php'); $addon = basename($dir);
$files = glob($dir . '/' . $addon . '.php');
foreach($files as $file) { foreach($files as $file) {
echo $file . "\n"; echo $file . "\n";
if(stristr($file,'jappixmini/proxy.php'))
continue;
include_once($file); include_once($file);
} }
} }