move scripts to just before </body>, add event for scripts that need to be in <head>

[quix0rs-gnu-social.git] / lib / common.php
diff --git a/lib/common.php b/lib/common.php

index c3e83789fb5ef217f9a4660e6a19d322486ab1c7..88d77732f4cda50508fe33e94585048baf56454c 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -17,9 +17,12 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  
-define('STATUSNET_VERSION', '0.8.1pre1');
+define('STATUSNET_VERSION', '0.8.2dev');
+define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
+
+define('STATUSNET_CODENAME', 'Second Guessing');
  
  define('AVATAR_PROFILE_SIZE', 96);
  define('AVATAR_STREAM_SIZE', 48);
@@ -341,11 +344,15 @@ function addPlugin($name, $attrs = null)
  if (isset($conffile)) {
      $_config_files = array($conffile);
  } else {
-    $_config_files = array('/etc/statusnet/laconica.php',
-                           '/etc/statusnet/'.$_server.'.php');
+    $_config_files = array('/etc/statusnet/statusnet.php',
+                           '/etc/statusnet/laconica.php',
+                           '/etc/laconica/laconica.php',
+                           '/etc/statusnet/'.$_server.'.php',
+                           '/etc/laconica/'.$_server.'.php');
  
      if (strlen($_path) > 0) {
          $_config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php';
+        $_config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
      }
  
      $_config_files[] = INSTALLDIR.'/config.php';