X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fframework.php;h=620730370f4c8d75a64a6ba71aea338cbe1e9f82;hb=15ab9ff9e3303255ff14166ee86ffdf3bc4f52ce;hp=76ba549098effb2f27abee3607bbba55b3356763;hpb=c942bdcb4321549879a0f3f5d2ab514d33b90996;p=quix0rs-gnu-social.git

diff --git a/lib/framework.php b/lib/framework.php
index 76ba549098..620730370f 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -22,8 +22,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.1.1');
-define('GNUSOCIAL_LIFECYCLE', 'alpha'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('GNUSOCIAL_BASE_VERSION', '1.2.0');
+define('GNUSOCIAL_LIFECYCLE', 'beta4'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
 
@@ -37,6 +37,11 @@ define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
 define('MESSAGES_PER_PAGE', 20);
 define('GROUPS_PER_PAGE', 20);
+define('APPS_PER_PAGE', 20);
+define('PEOPLETAGS_PER_PAGE', 20);
+
+define('GROUPS_PER_MINILIST', 8);
+define('PROFILES_PER_MINILIST', 8);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);
@@ -97,15 +102,15 @@ require_once(INSTALLDIR.'/lib/plugin.php');
 
 function addPlugin($name, array $attrs=array())
 {
-    return StatusNet::addPlugin($name, $attrs);
+    return GNUsocial::addPlugin($name, $attrs);
 }
 
 function _have_config()
 {
-    return StatusNet::haveConfig();
+    return GNUsocial::haveConfig();
 }
 
-function __autoload($cls)
+function GNUsocial_class_autoload($cls)
 {
     if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
         require_once(INSTALLDIR.'/classes/' . $cls . '.php');
@@ -114,45 +119,46 @@ 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.
- *
- * 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.
+ * Extlibs with namespaces (or directly in extlib/)
+ * This covers libraries such as: Validate and \Michelf\Markdown
  *
- * 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){
+    $class_base = preg_replace('{\\\\|_(?!.*\\\\)}', DIRECTORY_SEPARATOR, ltrim($class, '\\'));
+    $file = INSTALLDIR."/extlib/{$class_base}.php";
+    if (file_exists($file)) {
+        require_once $file;
+        return;
+    }
+
+    # Try if the system has this external library
+    $file = "/usr/share/php/{$class_base}.php";
+    if (file_exists($file)) {
+        require_once $file;
+        return;
+    }
+});
 
 require_once INSTALLDIR.'/lib/util.php';
 require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/lib/mail.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)
+function PEAR_ErrorToPEAR_Exception(PEAR_Error $err)
 {
     //DB_DataObject throws error when an empty set would be returned
     //That behavior is weird, and not how the rest of StatusNet works.