aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-10 17:12:48 -0700
committerfriendica <info@friendica.com>2013-09-10 17:12:48 -0700
commit7ada499ca9a1424a59204d87edb5856f88a79b59 (patch)
treeaf1b87755abe9c5276a07869ee5a7d5729d71fd7
parent72f562c190630e69fa5a223855cd6f3a3bc66e49 (diff)
parent5aaf8b8e9940d99befd00619238cd20c3894e5a9 (diff)
downloadvolse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.tar.gz
volse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.tar.bz2
volse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.zip
Merge https://github.com/friendica/red into zpull
-rwxr-xr-xboot.php6
-rw-r--r--install/database.sql2
-rw-r--r--install/update.php9
-rw-r--r--mod/channel.php5
-rw-r--r--mod/zfinger.php3
-rwxr-xr-xview/tpl/admin_logs.tpl2
-rwxr-xr-xview/tpl/admin_plugins.tpl2
-rwxr-xr-xview/tpl/admin_plugins_details.tpl2
-rwxr-xr-xview/tpl/admin_site.tpl2
-rwxr-xr-xview/tpl/admin_summary.tpl2
-rwxr-xr-xview/tpl/admin_users.tpl2
11 files changed, 20 insertions, 17 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', '<br />' . "\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 @@
<?php
-define( 'UPDATE_VERSION' , 1068 );
+define( 'UPDATE_VERSION' , 1069 );
/**
*
@@ -782,3 +782,10 @@ function update_r1067() {
return UPDATE_FAILED;
}
+function update_r1068(){
+ $r = q("ALTER TABLE `hubloc` ADD `hubloc_status` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `hubloc_flags` , ADD INDEX ( `hubloc_status` )");
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}
+
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) {
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
+}
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 @@
-<div id='adminpage'>
+<div class="generic-content-wrapper" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/logs" method="post">
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 @@
-<div id='adminpage'>
+<div class="generic-content-wrapper" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
<ul id='pluginslist'>
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 @@
-<div id='adminpage'>
+<div class = "generic-content-wrapper" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
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 @@
});
});
</script>
-<div id='adminpage'>
+<div id="adminpage" class="generic-content-wrapper">
<h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/site" method="post">
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 @@
-<div id='adminpage'>
+<div class="generic-content-wrapper" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
<dl>
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;
}
</script>
-<div id='adminpage'>
+<div class = "generic-content-wrapper" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/users" method="post">