GoteoFoundation
diff --git a/‎Resources/templates/responsive/channel/call/partials/map.php‎
Lines changed: 1 addition & 1 deletion b/‎Resources/templates/responsive/channel/call/partials/map.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎composer.json‎
Lines changed: 1 addition & 1 deletion b/‎composer.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎composer.lock‎
Lines changed: 25 additions & 18 deletions b/‎composer.lock‎
Lines changed: 25 additions & 18 deletions
diff --git a/‎extend/extra-logger/start.php‎
Lines changed: 0 additions & 1 deletion b/‎extend/extra-logger/start.php‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Goteo/Application/EventListener/ExceptionListener.php‎
Lines changed: 15 additions & 10 deletions b/‎src/Goteo/Application/EventListener/ExceptionListener.php‎
Lines changed: 15 additions & 10 deletions
diff --git a/‎src/Goteo/Console/Command/DBVerifierCommand.php‎
Lines changed: 17 additions & 11 deletions b/‎src/Goteo/Console/Command/DBVerifierCommand.php‎
Lines changed: 17 additions & 11 deletions
diff --git a/‎src/Goteo/Core/Traits/LoggerTrait.php‎
Lines changed: 1 addition & 11 deletions b/‎src/Goteo/Core/Traits/LoggerTrait.php‎
Lines changed: 1 addition & 11 deletions
diff --git a/‎src/Goteo/Core/Traits/StaticLoggerTrait.php‎
Lines changed: 1 addition & 11 deletions b/‎src/Goteo/Core/Traits/StaticLoggerTrait.php‎
Lines changed: 1 addition & 11 deletions
@@ -21,7 +21,7 @@
   }
 
   if ($map_config['center']) {
-    $url .= '/' . implode($map_config['center'],',');
+    $url .= '/' . implode(',', $map_config['center']);
   }
 
 
 
@@ -18,7 +18,7 @@
         "jdorn/file-system-cache": "dev-master",
         "intervention/image": "~2.0",
         "mibe/feedwriter": "~1.0",
-        "lusitanian/oauth": "^0.8.9",
+        "lusitanian/oauth": "dev-master#c3b5e51fcf86ebe83023d34744d7da131a9744a5",
         "iignatov/lightopenid": "~1.0",
         "paypal/adaptivepayments-sdk-php": "*",
         "paypal/merchant-sdk-php": "*",
 
@@ -24,7 +24,6 @@
 $gelf = Config::get('plugins.extra-logger.gelf');
 if($gelf && $gelf["host"]) {
     $handler = new GelfHandler(new Publisher( new UdpTransport($gelf["host"], $gelf["port"]) ));
-
     App::getService('logger')->pushHandler($handler);
     App::getService('syslogger')->pushHandler($handler);
     App::getService('paylogger')->pushHandler($handler);
 
@@ -97,17 +97,22 @@ static function jTraceEx($e, $with_message = true, $seen = null) {
     protected function logException(\Exception $exception, $message) {
         if (null !== $this->logger) {
             $message = str_replace(["\n", "\r"],[" ", ""], $message);
-            if ($exception instanceof LegacyError) {
-                $this->logger->warning('Kernel Exception', ['etype' => 'LegacyError', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
-            } elseif (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
-                $this->logger->critical('Kernel Exception', ['etype' => 'HttpException', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
-            } elseif ($exception instanceof ModelNotFoundException) {
-                $this->logger->warning('Kernel Exception', ['etype' => 'NotFound', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
-            } elseif ($exception instanceof ControllerAccessDeniedException) {
-                $this->logger->warning('Kernel Exception', ['etype' => 'AccessDenied', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
-            } else {
-                $this->logger->error('Kernel Exception', ['etype' => 'Exception', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
+            try {
+                if ($exception instanceof LegacyError) {
+                    $this->logger->warning('Kernel Exception', ['etype' => 'LegacyError', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
+                } elseif (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
+                    $this->logger->critical('Kernel Exception', ['etype' => 'HttpException', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
+                } elseif ($exception instanceof ModelNotFoundException) {
+                    $this->logger->warning('Kernel Exception', ['etype' => 'NotFound', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
+                } elseif ($exception instanceof ControllerAccessDeniedException) {
+                    $this->logger->warning('Kernel Exception', ['etype' => 'AccessDenied', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
+                } else {
+                    $this->logger->error('Kernel Exception', ['etype' => 'Exception', 'trace' => self::jTraceEx($exception, false), 'exception' => $exception, 'message' => $message]);
+                }
+            } catch(\RuntimeException $e) {
+                // Ignore error logging here, it should be cached by the app
             }
+
         }
     }
 
 
@@ -10,11 +10,14 @@
 
 namespace Goteo\Console\Command;
 
+use Exception;
 use Goteo\Application\Config;
 use Goteo\Model\Mail;
 use Goteo\Model\Project;
 use Goteo\Model\Template;
 use Goteo\Util\AnsiConverter\Theme\SolarizedLightTheme;
+use PDO;
+use RuntimeException;
 use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
@@ -81,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $update = $input->getOption('update');
         $scope = $input->getArgument('scope');
         if(!in_array($scope, ['all', 'feed', 'mailing', 'token', 'blocked', 'toolkit', 'predict'])) {
-            throw new \Exception('Scope is not valid!');
+            throw new Exception('Scope is not valid!');
         }
 
         $verbose = $output->isVerbose();
@@ -90,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $days = (int) $input->getOption('days');
             if($days == -1) $days = 120;
             if($days < 30) {
-                throw new \Exception('Number of days must be greater than 30!');
+                throw new Exception('Number of days must be greater than 30!');
             }
             $index = $fixes = 0;
             $output->writeln("Checking old feed data...");
@@ -101,7 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if($verbose) {
                 $query = Project::query("SELECT * FROM feed $where");
 
-                foreach ($query->fetchAll(\PDO::FETCH_CLASS) as $feed) {
+                foreach ($query->fetchAll(PDO::FETCH_CLASS) as $feed) {
                     $output->writeln("Found old feed <info>{$feed->title}</info> with ID <comment>{$feed->id}</comment> and date <comment>{$feed->datetime}</comment>");
                 }
             }
@@ -122,14 +125,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $days = (int) $input->getOption('days');
             if($days == -1) $days = 4;
             if($days < 1) {
-                throw new \Exception('Number of days must be greater than 2!');
+                throw new Exception('Number of days must be greater than 2!');
             }
 
             $output->writeln("Checking token older thant $days days...");
             // eliminamos los tokens que tengan más de $days días
             $sql = "SELECT id, token FROM user WHERE token IS NOT NULL AND token != '' AND token LIKE '%¬%'";
             $query = Project::query($sql);
-            foreach ($query->fetchAll(\PDO::FETCH_OBJ) as $row) {
+            foreach ($query->fetchAll(PDO::FETCH_OBJ) as $row) {
                 $parts = explode('¬', $row->token);
                 $datepart = strtotime($parts[2]);
                 $today = date('Y-m-d');
@@ -154,7 +157,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $days = (int) $input->getOption('days');
             if($days == -1) $days = 365;
             if($days < 30) {
-                throw new \Exception('Number of days must be greater than 30!');
+                throw new Exception('Number of days must be greater than 30!');
             }
 
             $output->writeln("Checking old mail data...");
@@ -164,7 +167,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $query = Project::query("SELECT * FROM mail $where", [':template1' => Template::NEWSLETTER, ':template2' => Template::MESSAGE_DONORS]);
 
             $found = 0;
-            foreach ($query->fetchAll(\PDO::FETCH_CLASS) as $mail) {
+            foreach ($query->fetchAll(PDO::FETCH_CLASS) as $mail) {
                 if($verbose) {
                     $output->writeln("Found old mail <info>{$mail->email}</info>, Template <comment>{$mail->template}</comment> Subject <info>[{$mail->subject}]</info> with ID <comment>{$mail->id}</comment> and date <comment>{$mail->date}</comment>");
                 }
@@ -177,6 +180,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     }
                 }
             }
+            if($update) {
+                Project::query("DELETE FROM mail_stats_location WHERE id NOT IN (SELECT id FROM mail_stats)");
+            }
             $query = Project::query("SELECT count(*) as total FROM mail");
             $total = $query->fetchColumn();
             $output->writeln("Found <comment>$found</comment> <info>mail records</info> older than <comment>$days days</comment> from a total of <comment>$total</comment> records");
@@ -187,7 +193,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $days = (int) $input->getOption('days');
             if($days == -1) $days = 120;
             if($days < 30) {
-                throw new \Exception('Number of days must be greater than 120!');
+                throw new Exception('Number of days must be greater than 120!');
             }
 
             $output->writeln("Checking old blocked users for mailing...");
@@ -196,7 +202,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $query = Project::query("SELECT * FROM mailer_control $where");
 
             $found = 0;
-            foreach ($query->fetchAll(\PDO::FETCH_CLASS) as $usr) {
+            foreach ($query->fetchAll(PDO::FETCH_CLASS) as $usr) {
                 if($verbose) {
                     $output->writeln("Found blocked subscriber <info>{$usr->email}</info>, Template <comment>{$usr->bounces}</comment> Reason <info>[{$usr->last_reason}]</info> and date <comment>{$usr->modified}</comment>");
                 }
@@ -246,7 +252,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $mailer = Mail::createFromHtml(Config::getMail('fail'), '', "DATABASE INCONSISTENCY in [" .Config::get('url.main')."]", $html);
                 $errors = [];
                 if(!$mailer->send($errors)) {
-                    throw new \RuntimeException('Error sending email: ' . implode("\n", $errors));
+                    throw new RuntimeException('Error sending email: ' . implode("\n", $errors));
                 }
             } else {
                 $output->writeln("<info>Everything ok</info>");
@@ -272,7 +278,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $mailer = Mail::createFromHtml(Config::getMail('fail'), '', "FAILING PROJECTS PREDICTION in [" .Config::get('url.main')."]", $html);
                 $errors = [];
                 if(!$mailer->send($errors)) {
-                    throw new \RuntimeException('Error sending email: ' . implode("\n", $errors));
+                    throw new RuntimeException('Error sending email: ' . implode("\n", $errors));
                 }
             } else {
                 $output->writeln("<info>Everything ok</info>");
 
@@ -11,10 +11,8 @@
 namespace Goteo\Core\Traits;
 
 use Goteo\Application\App;
-use Goteo\Application\Config;
 use Goteo\Util\Monolog\Processor\WebProcessor;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 
 /**
  * Trait to add log common methods
@@ -37,15 +35,7 @@ public function getLog() {
     public function log($message, array $context = [], $func = 'info') {
         $logger = $this->getLog();
         if (null !== $logger && method_exists($logger, $func)) {
-            if(Config::get('debug')) {
-                return $logger->$func($message, WebProcessor::processObject($context));
-            } else {
-                try {
-                    return $logger->$func($message, WebProcessor::processObject($context));
-                } catch(RuntimeException $e) {
-                    // nothing here, if not in debug mode, failure to process logs is ignored
-                }
-            }
+            return $logger->$func($message, WebProcessor::processObject($context));
         }
     }
 
 
@@ -12,8 +12,6 @@
 
 use Goteo\Util\Monolog\Processor\WebProcessor;
 use Psr\Log\LoggerInterface;
-use Goteo\Application\Config;
-use RuntimeException;
 
 /**
  * Trait to use log on legacy classes
@@ -32,15 +30,7 @@ static public function getLogger(LoggerInterface $logger) {
 
     static public function log($message, array $context = [], $func = 'info') {
         if(static::$logger) {
-            if(Config::get('debug')) {
-                return static::$logger->$func($message, WebProcessor::processObject($context));
-            } else {
-                try {
-                    return static::$logger->$func($message, WebProcessor::processObject($context));
-                } catch(RuntimeException $e) {
-                    // nothing here, if not in debug mode, failure to process logs is ignored
-                }
-            }
+            return static::$logger->$func($message, WebProcessor::processObject($context));
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`if ($map_config['center']) {`
`24`		`- $url .= '/' . implode($map_config['center'],',');`
	`24`	`+ $url .= '/' . implode(',', $map_config['center']);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`