X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommon.php;h=ca02a3e7fbc8f7854b570f059bc19abca950198a;hb=1d29ba83150bdd7a23e497ca9a743ac2b6158b6f;hp=0a0f5c6317e4cb90d3ca72b7204e8fa2638aa1c6;hpb=4419e43f7f62d92f01ba8f844aa9cd472051dd84;p=quix0rs-gnu-social.git diff --git a/lib/common.php b/lib/common.php index 0a0f5c6317..ca02a3e7fb 100644 --- a/lib/common.php +++ b/lib/common.php @@ -1,7 +1,7 @@ getCode() == DB_DATAOBJECT_ERROR_NODATA) { - return; - } - if ($err->getCode()) { - throw new PEAR_Exception($err->getMessage(), $err->getCode()); - } - throw new PEAR_Exception($err->getMessage()); -} -PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception'); +// All the fun stuff to actually initialize StatusNet's framework code, +// without loading up a site configuration. +require_once INSTALLDIR . '/lib/framework.php'; try { StatusNet::init(@$server, @$path, @$conffile); } catch (NoConfigException $e) { // XXX: Throw a conniption if database not installed // XXX: Find a way to use htmlwriter for this instead of handcoded markup - echo '

'. _('No configuration file found. ') .'

'; - echo '

'. _('I looked for configuration files in the following places: ') .'
'; - echo implode($e->configFiles, '
'); + // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. + echo '

'. _('No configuration file found.') .'

'; + // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. + // TRANS: Is followed by a list of directories (separated by HTML breaks). + echo '

'. _('I looked for configuration files in the following places:') .'
'; + echo implode($e->configFiles, '
'); + // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. echo '

'. _('You may wish to run the installer to fix this.') .'

'; + // @todo FIXME Link should be in a para? + // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. + // TRANS: The text is link text that leads to the installer page. echo ''. _('Go to the installer.') .''; exit; } -