X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fframework.php;h=30b98d259fe001af84f54d2451362459204a7a7f;hb=c81cd18796cb9208b9134b526d651ddc0db9edcd;hp=f4308ac6bd3f6178415a9de19d8699cd65142f49;hpb=71853f40a02c1b80b91cd9b28667f1f0a36bd5ba;p=quix0rs-gnu-social.git

diff --git a/lib/framework.php b/lib/framework.php
index f4308ac6bd..30b98d259f 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -17,15 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
-define('STATUSNET_BASE_VERSION', '1.0.1');
-define('STATUSNET_LIFECYCLE', 'rc1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
-define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
+define('GNUSOCIAL_ENGINE', 'GNU social');
+define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
+define('GNUSOCIAL_BASE_VERSION', '1.1.3');
+define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
-define('STATUSNET_CODENAME', 'Get It Together');
+define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
+
+define('GNUSOCIAL_CODENAME', 'The Spanish Invasion');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -34,6 +36,7 @@ define('AVATAR_MINI_SIZE', 24);
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
 define('MESSAGES_PER_PAGE', 20);
+define('GROUPS_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);
@@ -72,10 +75,17 @@ if (!function_exists('dl')) {
 
 // global configuration object
 
-require_once('PEAR.php');
-require_once('PEAR/Exception.php');
-require_once('DB/DataObject.php');
-require_once('DB/DataObject/Cast.php'); # for dates
+require_once 'PEAR.php';
+require_once 'PEAR/Exception.php';
+global $_PEAR;
+$_PEAR = new PEAR;
+$_PEAR->setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');
+
+require_once 'DB.php';
+require_once 'DB/DataObject.php';
+require_once 'DB/DataObject/Cast.php'; # for dates
+global $_DB;
+$_DB = new DB;
 
 require_once(INSTALLDIR.'/lib/language.php');
 
@@ -85,7 +95,7 @@ require_once(INSTALLDIR.'/lib/language.php');
 require_once(INSTALLDIR.'/lib/event.php');
 require_once(INSTALLDIR.'/lib/plugin.php');
 
-function addPlugin($name, $attrs = null)
+function addPlugin($name, array $attrs=array())
 {
     return StatusNet::addPlugin($name, $attrs);
 }
@@ -95,7 +105,7 @@ function _have_config()
     return StatusNet::haveConfig();
 }
 
-function __autoload($cls)
+function GNUsocial_class_autoload($cls)
 {
     if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
         require_once(INSTALLDIR.'/classes/' . $cls . '.php');
@@ -104,43 +114,34 @@ function __autoload($cls)
     } else if (mb_substr($cls, -6) == 'Action' &&
                file_exists(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php')) {
         require_once(INSTALLDIR.'/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
-    } else if ($cls == 'OAuthRequest') {
+    } else if ($cls === 'OAuthRequest' || $cls === 'OAuthException') {
         require_once('OAuth.php');
     } else {
         Event::handle('Autoload', array(&$cls));
     }
 }
 
-// XXX: how many of these could be auto-loaded on use?
-// XXX: note that these files should not use config options
-// at compile time since DB config options are not yet loaded.
-
-require_once 'Validate.php';
-require_once 'markdown.php';
-
-// XXX: other formats here
+// Autoload function queue, starting with our own discovery method
+spl_autoload_register('GNUsocial_class_autoload');
 
 /**
- * Avoid the NICKNAME_FMT constant; use the Nickname class instead.
+ * Extlibs with namespaces (or directly in extlib/)
+ * This covers libraries such as: Validate and \Michelf\Markdown
  *
- * Nickname::DISPLAY_FMT is more suitable for inserting into regexes;
- * note that it includes the [] and repeating bits, so should be wrapped
- * directly in a capture paren usually.
- *
- * For validation, use Nickname::normalize(), Nickname::isValid() etc.
- *
- * @deprecated
- */
-define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
+ * The namespaced based structure is called "PSR-0 autoloading standard":
+ *    \<Vendor Name>\(<Namespace>\)*<Class Name>
+ * and is available here: http://www.php-fig.org/psr/psr-0/
+*/
+spl_autoload_register(function($class){
+    $file = INSTALLDIR.'/extlib/'.preg_replace('{\\\\|_(?!.*\\\\)}', DIRECTORY_SEPARATOR, ltrim($class, '\\')).'.php';
+    if (file_exists($file)) {
+        require_once $file;
+    }
+});
 
 require_once INSTALLDIR.'/lib/util.php';
 require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/lib/mail.php';
-require_once INSTALLDIR.'/lib/subs.php';
-
-require_once INSTALLDIR.'/lib/clientexception.php';
-require_once INSTALLDIR.'/lib/serverexception.php';
-
 
 //set PEAR error handling to use regular PHP exceptions
 function PEAR_ErrorToPEAR_Exception($err)
@@ -159,11 +160,17 @@ function PEAR_ErrorToPEAR_Exception($err)
 
     common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)");
 
+    // HACK: queue handlers get kicked by the long-query killer, and 
+    // keep the same broken connection. We die here to get a new
+    // process started.
+
+    if (php_sapi_name() == 'cli' && preg_match('/nativecode=2006/', $userInfo)) {
+        common_log(LOG_ERR, "Lost DB connection; dying.");
+        exit(100);
+    }
+
     if ($err->getCode()) {
-        throw new PEAR_Exception($msg, $err, $err->getCode());
-    } else {
-        throw new PEAR_Exception($msg, $err);
+        throw new PEAR_Exception($err->getMessage(), $err->getCode());
     }
+    throw new PEAR_Exception($err->getMessage());
 }
-
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');