??? Not callable?

[quix0rs-gnu-social.git] / lib / framework.php

diff --git a/lib/framework.php b/lib/framework.php
index fc0f35686c2c6fa196650fc7bc79a8709c81a6d7..b7fd44512c58fa850c5a42f14f9da9aa83c7cf30 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -22,12 +22,12 @@ 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.1.3');
+define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
 
-define('GNUSOCIAL_CODENAME', 'Not decided yet');
+define('GNUSOCIAL_CODENAME', 'Only a fixed bug is a good bug.');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -105,6 +105,28 @@ function _have_config()
     return StatusNet::haveConfig();
 }
 
+function common_get_temp_dir()
+{
+    // Try to get it from php.ini first
+    $temp_path = trim(ini_get('upload_tmp_dir'));
+
+    // Is it empty?
+    if (strlen($temp_path) == 0) {
+        // Then try sys_get_temp_dir()
+        $temp_path = trim(sys_get_temp_dir());
+
+        // Still empty?
+        if (strlen($temp_path) == 0) {
+            // Then set it to /tmp (ugly)
+            // @TODO Hard-coded non-Windows stuff!
+            $temp_path = '/tmp';
+        }
+    }
+
+    // Return found path
+    return $temp_path;
+}
+
 function GNUsocial_class_autoload($cls)
 {
     if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
@@ -121,15 +143,18 @@ function GNUsocial_class_autoload($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.
 
-// Autoload queue
+// Autoload function queue, starting with our own discovery method
 spl_autoload_register('GNUsocial_class_autoload');
 
-// Extlibs with namespaces (or directly in extlib/)
-// such as: Validate and \Michelf\Markdown
+/**
+ * Extlibs with namespaces (or directly in extlib/)
+ * This covers libraries such as: Validate and \Michelf\Markdown
+ *
+ * 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)) {
@@ -141,10 +166,6 @@ 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)
 {