add rudimentary locking capability to Friendica functions

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 8b1f5a2e5a1d72d0e61af17666ed39d1b8b44e00..239c09ee242f1aecc88be2b4d09836396838df50 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1393' );
+define ( 'FRIENDICA_VERSION',      '3.0.1394' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1151      );
 
@@ -34,6 +34,24 @@ define ( 'JPEG_QUALITY',            100  );
  */
 define ( 'PNG_QUALITY',             8  );
 
+/**
+ *
+ * An alternate way of limiting picture upload sizes. Specify the maximum pixel
+ * length that pictures are allowed to be (for non-square pictures, it will apply
+ * to the longest side). Pictures longer than this length will be resized to be
+ * this length (on the longest side, the other side will be scaled appropriately).
+ * Modify this value using
+ *
+ *    $a->config['system']['max_image_length'] = n;
+ *
+ * in .htconfig.php
+ *
+ * If you don't want to set a maximum length, set to -1. The default value is
+ * defined by 'MAX_IMAGE_LENGTH' below.
+ *
+ */
+define ( 'MAX_IMAGE_LENGTH',        -1  );
+
 
 /**
  * Not yet used
@@ -357,7 +375,7 @@ if(! class_exists('App')) {
                                        // convert punycode back to utf-8
                                        require_once('library/simplepie/idn/idna_convert.class.php');
                                        $x = new idna_convert();
-                                       $this->hostname = $x->decode($s);
+                                       $this->hostname = $x->decode($_SERVER['SERVER_NAME']);
                                }
 
                                if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)