beenull/abook_carddav_squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "aggressive error logging during startup"

Browse source 
This reverts commit 59295f9cae.
This commit is contained in:
Alexey Shpakovsky 2021-05-28 23:19:52 +02:00
parent 245cef430c
commit a54c51f954
No known key found for this signature in database
GPG key ID: 5797A726A2A4230A
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
abook_class.php
View file

@ -69,7 +69,7 @@ class abook_carddav extends addressbook_backend {
$this->listing = $param['listing']; $this->listing = $param['listing'];
} }
return $this->open(true); $this->open(true);
} }
else { else {
return $this->set_error('Invalid argument to constructor'); return $this->set_error('Invalid argument to constructor');
@ -87,15 +87,12 @@ class abook_carddav extends addressbook_backend {
$discover = new Discovery(); $discover = new Discovery();
$abooks = $discover->discoverAddressbooks($this->account); $abooks = $discover->discoverAddressbooks($this->account);
} catch (\Exception $e) { } catch (\Exception $e) {
echo "Error during addressbook discovery: " . $e->getMessage(); // $log->error("!!! Error during addressbook discovery: " . $e->getMessage());
return $this->set_error(_("Error during addressbook discovery: ") . $e->getMessage()); exit(1);
// exit(1);
} }
if (count($abooks) <= 0) { if (count($abooks) <= 0) {
// $log->warning("Cannot proceed because no addressbooks were found - exiting"); // $log->warning("Cannot proceed because no addressbooks were found - exiting");
echo "Cannot proceed because no addressbooks were found - exiting"; exit(0);
return $this->set_error(_("Cannot proceed because no addressbooks were found - exiting"));
// exit(0);
} }
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
// THE FOLLOWING SHOWS HOW TO PERFORM A SYNCHRONIZATION // // THE FOLLOWING SHOWS HOW TO PERFORM A SYNCHRONIZATION //