Update the `thr-parent` field in the `item` table

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 56f88a489a71eade7a2365ead909fad332623cb5..1752b3fe8fd8f6291a0935df5c44f98fdfc24ef3 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -183,13 +183,15 @@ function admin_page_summary(&$a) {
                Array( t('Normal Account'), 0),
                Array( t('Soapbox Account'), 0),
                Array( t('Community/Celebrity Account'), 0),
-               Array( t('Automatic Friend Account'), 0)
+               Array( t('Automatic Friend Account'), 0),
+               Array( t('Blog Account'), 0),
+               Array( t('Private Forum'), 0)
        );
 
        $users=0;
        foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
 
-       logger('accounts: ' . print_r($accounts,true));
+       logger('accounts: ' . print_r($accounts,true),LOGGER_DATA);
 
        $r = q("SELECT COUNT(id) as `count` FROM `register`");
        $pending = $r[0]['count'];
@@ -248,6 +250,7 @@ function admin_page_site_post(&$a){
        $block_public           =       ((x($_POST,'block_public'))             ? True  :       False);
        $force_publish          =       ((x($_POST,'publish_all'))              ? True  :       False);
        $global_directory       =       ((x($_POST,'directory_submit_url'))     ? notags(trim($_POST['directory_submit_url']))  : '');
+       $thread_allow           =       ((x($_POST,'thread_allow'))             ? True  :       False);
        $no_multi_reg           =       ((x($_POST,'no_multi_reg'))             ? True  :       False);
        $no_openid                      =       !((x($_POST,'no_openid'))               ? True  :       False);
        $no_regfullname         =       !((x($_POST,'no_regfullname'))  ? True  :       False);
@@ -340,6 +343,7 @@ function admin_page_site_post(&$a){
        } else {
                set_config('system','directory_submit_url', $global_directory);
        }
+       set_config('system','thread_allow', $thread_allow);
 
        set_config('system','block_extended_register', $no_multi_reg);
        set_config('system','no_openid', $no_openid);
@@ -440,6 +444,7 @@ function admin_page_site(&$a) {
                '$block_public'         => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
                '$force_publish'        => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
                '$global_directory'     => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
+               '$thread_allow'         => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
                        
                '$no_multi_reg'         => array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
                '$no_openid'            => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
@@ -469,6 +474,9 @@ function admin_page_dbsync(&$a) {
 
        if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
                set_config('database', 'update_' . intval($a->argv[3]), 'success');
+               $curr = get_config('system','build');
+               if(intval($curr) == intval($a->argv[3]))
+                       set_config('system','build',intval($curr) + 1);
                info( t('Update has been marked successful') . EOL);
                goaway($a->get_baseurl(true) . '/admin/dbsync');
        }