From f93e92c260ca4ef248e5b079b1cd02a4a7d08d6c Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Tue, 10 Sep 2013 14:18:51 +0200 Subject: extends DB in hubloc to maintain hubloc connectivity --- boot.php | 6 +----- install/database.sql | 2 ++ install/update.php | 9 ++++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index 4c2e27f93..ed645f6ea 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1068 ); +define ( 'DB_UPDATE_VERSION', 1069 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1206,7 +1206,6 @@ function check_config(&$a) { // We're reporting a different version than what is currently installed. // Run any existing update scripts to bring the database up to current. - require_once('install/update.php'); // make sure that boot.php and update.php are the same release, we might be @@ -1214,10 +1213,8 @@ function check_config(&$a) { // file may not be here yet. This can happen on a very busy site. if(DB_UPDATE_VERSION == UPDATE_VERSION) { - for($x = $stored; $x < $current; $x ++) { if(function_exists('update_r' . $x)) { - // There could be a lot of processes running or about to run. // We want exactly one process to run the update command. // So store the fact that we're taking responsibility @@ -1229,7 +1226,6 @@ function check_config(&$a) { if(get_config('database','update_r' . $x)) break; set_config('database','update_r' . $x, '1'); - // call the specific update $func = 'update_r' . $x; diff --git a/install/database.sql b/install/database.sql index 9b1b6cad2..9ecbad5a6 100644 --- a/install/database.sql +++ b/install/database.sql @@ -367,6 +367,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( `hubloc_hash` char(255) NOT NULL, `hubloc_addr` char(255) NOT NULL DEFAULT '', `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0', + `hubloc_status` int(10) unsigned NOT NULL DEFAULT '0', `hubloc_url` char(255) NOT NULL DEFAULT '', `hubloc_url_sig` text NOT NULL, `hubloc_host` char(255) NOT NULL DEFAULT '', @@ -379,6 +380,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( KEY `hubloc_url` (`hubloc_url`), KEY `hubloc_guid` (`hubloc_guid`), KEY `hubloc_flags` (`hubloc_flags`), + KEY `hubloc_status` (`hubloc_status`), KEY `hubloc_connect` (`hubloc_connect`), KEY `hubloc_host` (`hubloc_host`), KEY `hubloc_addr` (`hubloc_addr`), diff --git a/install/update.php b/install/update.php index 1b6a2218e..24aed374d 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Tue, 10 Sep 2013 20:15:09 +0100 Subject: Admin templates. --- view/tpl/admin_logs.tpl | 2 +- view/tpl/admin_plugins.tpl | 2 +- view/tpl/admin_plugins_details.tpl | 2 +- view/tpl/admin_site.tpl | 2 +- view/tpl/admin_summary.tpl | 2 +- view/tpl/admin_users.tpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl index e5412429f..3d2adc660 100755 --- a/view/tpl/admin_logs.tpl +++ b/view/tpl/admin_logs.tpl @@ -1,4 +1,4 @@ -
+

{{$title}} - {{$page}}

diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 01c178c3e..729ba5dc8 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,4 +1,4 @@ -
+

{{$title}} - {{$page}}

    diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 47c33bec3..f72142e41 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,4 +1,4 @@ -
    +

    {{$title}} - {{$page}}

    {{$info.name}} - {{$info.version}} : {{$action}}

    diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 32c5db8fc..d0a5254fe 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -34,7 +34,7 @@ }); }); -
    +

    {{$title}} - {{$page}}

    diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 88d87c35d..d3665626f 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,4 +1,4 @@ -
    +

    {{$title}} - {{$page}}

    diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 86389e9f2..770df7eba 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,7 +10,7 @@ return false; } -
    +

    {{$title}} - {{$page}}

    -- cgit v1.2.3 From fec0c71445db41c5099ff4a5ca22c1db23b1568c Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 10 Sep 2013 21:52:13 +0200 Subject: make /channel respect "Maximum number of conversations to load at any time" setting like /network does. --- mod/channel.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 5d3855269..652084cf0 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -185,9 +185,8 @@ function channel_content(&$a, $update = 0, $load = false) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } - - $a->set_pager_itemspage(40); - + $itemspage = get_pconfig(local_user(),'system','itemspage'); + $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); if($load) { -- cgit v1.2.3 From 517baa86a3372f1bdb09f98a85c8f781365bcb1f Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 11 Sep 2013 00:29:27 +0200 Subject: No need to add name_updated twice in zfinger response --- mod/zfinger.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/zfinger.php b/mod/zfinger.php index 320f0ca71..36c1cc493 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -130,7 +130,6 @@ function zfinger_init(&$a) { $ret['photo_updated'] = $e['xchan_photo_date']; $ret['url'] = $e['xchan_url']; $ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']); - $ret['name_updated'] = $e['xchan_name_date']; $ret['target'] = $ztarget; $ret['target_sig'] = $zsig; $ret['searchable'] = $searchable; @@ -250,4 +249,4 @@ function zfinger_init(&$a) { } json_return_and_die($ret); -} \ No newline at end of file +} -- cgit v1.2.3