Merge branch 'master' of https://github.com/friendica/friendica

diff --git a/mod/admin.php b/mod/admin.php
index 8a79fb108cc408d6265419a85ebc3a7aa7535d30..9400a28e04aa4041cbeb2e2d1541e74b5cddc16e 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -274,12 +274,14 @@ function admin_page_site_post(&$a){
        $diaspora_enabled       =       ((x($_POST,'diaspora_enabled'))         ? True                                          : False);
        $ssl_policy             =       ((x($_POST,'ssl_policy'))               ? intval($_POST['ssl_policy'])                  : 0);
        $new_share              =       ((x($_POST,'new_share'))                ? True                                          : False);
+       $hide_help              =       ((x($_POST,'hide_help'))                ? True                                          : False);
        $use_fulltext_engine    =       ((x($_POST,'use_fulltext_engine'))      ? True                                          : False);
        $itemcache              =       ((x($_POST,'itemcache'))                ? notags(trim($_POST['itemcache']))             : '');
        $itemcache_duration     =       ((x($_POST,'itemcache_duration'))       ? intval($_POST['itemcache_duration'])          : 0);
        $lockpath               =       ((x($_POST,'lockpath'))                 ? notags(trim($_POST['lockpath']))              : '');
        $temppath               =       ((x($_POST,'temppath'))                 ? notags(trim($_POST['temppath']))              : '');
        $basepath               =       ((x($_POST,'basepath'))                 ? notags(trim($_POST['basepath']))              : '');
+       $singleuser             =       ((x($_POST,'singleuser'))               ? notags(trim($_POST['singleuser']))            : '');
 
        if($ssl_policy != intval(get_config('system','ssl_policy'))) {
                if($ssl_policy == SSL_POLICY_FULL) {
@@ -341,7 +343,12 @@ function admin_page_site_post(&$a){
                del_config('system','mobile-theme');
        } else {
                set_config('system','mobile-theme', $theme_mobile);
-       }
+        }
+        if ( $singleuser === '---' ) {
+            del_config('system','singleuser');
+        } else {
+            set_config('system','singleuser', $singleuser);
+        }
        set_config('system','maximagesize', $maximagesize);
        set_config('system','max_image_length', $maximagelength);
        set_config('system','jpeg_quality', $jpegimagequality);
@@ -380,6 +387,7 @@ function admin_page_site_post(&$a){
        set_config('system','diaspora_enabled', $diaspora_enabled);
 
        set_config('system','new_share', $new_share);
+       set_config('system','hide_help', $hide_help);
        set_config('system','use_fulltext_engine', $use_fulltext_engine);
        set_config('system','itemcache', $itemcache);
        set_config('system','itemcache_duration', $itemcache_duration);
@@ -426,12 +434,19 @@ function admin_page_site(&$a) {
             if (file_exists($file . '/mobile')) {
                 $theme_choices_mobile[$f] = $theme_name;
             }
-                       else {
+               else {
                 $theme_choices[$f] = $theme_name;
                        }
                }
        }
-       
+
+        /* get user names to make the install a personal install of X */
+        $user_names = array();
+        $user_names['---'] = t('Multi user instance');
+        $users = q("SELECT username, nickname FROM `user`");
+        foreach ($users as $user) {
+            $user_names[$user['nickname']] = $user['username'];
+        }
        
        /* Banner */
        $banner = get_config('system','banner');
@@ -474,6 +489,8 @@ function admin_page_site(&$a) {
                '$theme_mobile'         => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
                '$ssl_policy'           => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
                '$new_share'            => array('new_share', t("'Share' element"), get_config('system','new_share'), t("Activates the bbcode element 'share' for repeating items.")),
+               '$hide_help'            => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
+               '$singleuser'           => array('singleuser', t("Single user instance"), get_config('system','singleuser'), t("Make this instance multi-user or single-user for the named user"), $user_names),
                '$maximagesize'         => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
                '$maximagelength'               => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
                '$jpegimagequality'             => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),

diff --git a/mod/item.php b/mod/item.php
index d04ab71deae41e9bd2cfdc8f1797eae92dbd37ad..4fd4a23dc0c3628ea5a6bcd1f73b1d5bede3d7b2 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -872,14 +872,20 @@ function item_post(&$a) {
                                 } else {
                                    $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
                                 }
-                               $headers  = 'From: ' . email_header_encode($a->user['username'],'UTF-8') . ' <' . $a->user['email'] . '>' . "\n";
-                               $headers .= 'MIME-Version: 1.0' . "\n";
-                               $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-                               $headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
                                $link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
                                $html    = prepare_body($datarray);
                                $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
-                                @mail($addr, $subject, $message, $headers);
+                                include_once('include/html2plain.php');
+                                $params = array (
+                                    'fromName' => $a->user['username'],
+                                    'fromEmail' => $a->user['email'],
+                                    'toEmail' => $addr,
+                                    'replyTo' => $a->user['email'],
+                                    'messageSubject' => $subject,
+                                    'htmlVersion' => $message,
+                                    'textVersion' => html2plain($html.$disclaimer),
+                                );
+                                enotify::send($params);
                        }
                }
        }

diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index e8fdd425895c6240a6b8a786bd1f0a2503a57c19..a6fe2d789cbbc0126be00154c81fb02c4324c001 100644 (file)
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -51,6 +51,8 @@
        {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
        {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
        {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$singleuser }}{{ endinc }}
 
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index f033b52eeffaa7468f3e6639f98cc5da941a5c0b..bad0f52756e4c39945cbdd93099e5e3492ec8da9 100644 (file)
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@@ -52,10 +52,12 @@
        {{include file="field_input.tpl" field=$sitename}}
        {{include file="field_textarea.tpl" field=$banner}}
        {{include file="field_select.tpl" field=$language}}
-       {{include file="field_select.tpl" field=$theme}}
+        {{include file="field_select.tpl" field=$theme}}
        {{include file="field_select.tpl" field=$theme_mobile}}
        {{include file="field_select.tpl" field=$ssl_policy}}
        {{include file="field_checkbox.tpl" field=$new_share}}
+       {{include file="field_checkbox.tpl" field=$hide_help}}
+        {{include file="field_select.tpl" field=$singleuser}}
 
        
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>