From e7a57915f9c90c144d95918048d2523418866921 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 23 Mar 2019 12:08:35 +0100
Subject: CLI user-info fixes (#2292)

* CLI missing exit codes

https://github.com/FreshRSS/FreshRSS/issues/2291

* CLI catch for outdated databases

https://github.com/FreshRSS/FreshRSS/issues/2291#issuecomment-475856890
---
 app/Models/TagDAO.php | 14 +++++++++++---
 cli/list-users.php    |  2 ++
 cli/user-info.php     |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Models/TagDAO.php b/app/Models/TagDAO.php
index 0b4428f17..297d24c96 100644
--- a/app/Models/TagDAO.php
+++ b/app/Models/TagDAO.php
@@ -187,9 +187,17 @@ class FreshRSS_TagDAO extends Minz_ModelPdo implements FreshRSS_Searchable {
 	public function count() {
 		$sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'tag`';
 		$stm = $this->bd->prepare($sql);
-		$stm->execute();
-		$res = $stm->fetchAll(PDO::FETCH_ASSOC);
-		return $res[0]['count'];
+		if ($stm && $stm->execute()) {
+			$res = $stm->fetchAll(PDO::FETCH_ASSOC);
+			return $res[0]['count'];
+		} else {
+			$info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo();
+			if ($this->autoUpdateDb($info)) {
+				return $this->count();
+			}
+			Minz_Log::error('SQL error TagDAO::count: ' . $info[2]);
+			return false;
+		}
 	}
 
 	public function countEntries($id) {
diff --git a/cli/list-users.php b/cli/list-users.php
index 758bbdb46..b3ce9936f 100755
--- a/cli/list-users.php
+++ b/cli/list-users.php
@@ -13,3 +13,5 @@ if (FreshRSS_Context::$system_conf->default_user !== ''
 foreach ($users as $user) {
 	echo $user, "\n";
 }
+
+done();
diff --git a/cli/user-info.php b/cli/user-info.php
index 043bebf7c..125408c10 100755
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -51,3 +51,5 @@ foreach ($users as $username) {
 			"\n";
 	}
 }
+
+done();
-- 
cgit v1.2.3