Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

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

diff --git a/lib/framework.php b/lib/framework.php
index c0c5146794c924069aae29d7503bd2ab68d6864b..9f132b9d20a3b513d23e11ca0dadfc3116644645 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.3');
-define('GNUSOCIAL_LIFECYCLE', 'beta3'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('GNUSOCIAL_BASE_VERSION', '1.2.0');
+define('GNUSOCIAL_LIFECYCLE', 'alpha1'); // '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);
@@ -38,6 +38,9 @@ define('PROFILES_PER_PAGE', 20);
 define('MESSAGES_PER_PAGE', 20);
 define('GROUPS_PER_PAGE', 20);
 
+define('GROUPS_PER_MINILIST', 8);
+define('PROFILES_PER_MINILIST', 8);
+
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);
 define('FOREIGN_NOTICE_SEND_REPLY', 4);
@@ -97,12 +100,34 @@ 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 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)
@@ -121,6 +146,7 @@ function GNUsocial_class_autoload($cls)
     }
 }
 
+
 // Autoload function queue, starting with our own discovery method
 spl_autoload_register('GNUsocial_class_autoload');
 
@@ -144,7 +170,7 @@ require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/lib/mail.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.