harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add the project name to site info packet

Browse Source
This commit is contained in:
redmatrix 2015-10-19 16:07:14 -07:00
parent b49972a623
commit 57e0bfc5a9
7 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'redmatrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1157 );
define ( 'DB_UPDATE_VERSION', 1158 );
/**
* @brief Constant with a HTML line break.

12
include/zot.php
View File

@ -2724,6 +2724,7 @@ function import_site($arr, $pubkey) {
$sellpage = htmlspecialchars($arr['sellpage'],ENT_COMPAT,'UTF-8',false);
$site_location = htmlspecialchars($arr['location'],ENT_COMPAT,'UTF-8',false);
$site_realm = htmlspecialchars($arr['realm'],ENT_COMPAT,'UTF-8',false);
$site_project = htmlspecialchars($arr['project'],ENT_COMPAT,'UTF-8',false);
// You can have one and only one primary directory per realm.
// Downgrade any others claiming to be primary. As they have
@ -2742,13 +2743,14 @@ function import_site($arr, $pubkey) {
|| ($siterecord['site_sellpage'] != $sellpage)
|| ($siterecord['site_location'] != $site_location)
|| ($siterecord['site_register'] != $register_policy)
|| ($siterecord['site_project'] != $site_project)
|| ($siterecord['site_realm'] != $site_realm)) {
$update = true;
// logger('import_site: input: ' . print_r($arr,true));
// logger('import_site: stored: ' . print_r($siterecord,true));
$r = q("update site set site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s'
$r = q("update site set site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_project = '%s'
where site_url = '%s'",
dbesc($site_location),
intval($site_directory),
@ -2758,6 +2760,7 @@ function import_site($arr, $pubkey) {
dbesc(datetime_convert()),
dbesc($sellpage),
dbesc($site_realm),
dbeswc($site_project),
dbesc($url)
);
if(! $r) {
@ -2774,8 +2777,8 @@ function import_site($arr, $pubkey) {
}
else {
$update = true;
$r = q("insert into site ( site_location, site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage, site_realm )
values ( '%s', '%s', %d, %d, '%s', '%s', %d, '%s', '%s' )",
$r = q("insert into site ( site_location, site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage, site_realm, site_project )
values ( '%s', '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s' )",
dbesc($site_location),
dbesc($url),
intval($access_policy),
@ -2784,7 +2787,8 @@ function import_site($arr, $pubkey) {
dbesc($directory_url),
intval($register_policy),
dbesc($sellpage),
dbesc($site_realm)
dbesc($site_realm),
dbesc($site_project)
);
if(! $r) {
logger('import_site: record create failed. ' . print_r($arr,true));

4
install/schema_mysql.sql
View File

@ -1280,6 +1280,7 @@ CREATE TABLE IF NOT EXISTS `site` (
`site_realm` char(255) NOT NULL DEFAULT '',
`site_valid` smallint NOT NULL DEFAULT '0',
`site_dead` smallint NOT NULL DEFAULT '0',
`site_project` char(255) NOT NULL DEFAULT '',
PRIMARY KEY (`site_url`),
KEY `site_flags` (`site_flags`),
KEY `site_update` (`site_update`),
@ -1290,7 +1291,8 @@ CREATE TABLE IF NOT EXISTS `site` (
KEY `site_pull` (`site_pull`),
KEY `site_realm` (`site_realm`),
KEY `site_valid` (`site_valid`),
KEY `site_dead` (`site_dead`)
KEY `site_dead` (`site_dead`),
KEY `site_project` (`site_project`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------

2
install/schema_postgres.sql
View File

@ -983,6 +983,7 @@ CREATE TABLE "site" (
"site_realm" text NOT NULL DEFAULT '',
"site_valid" smallint NOT NULL DEFAULT '0',
"site_dead" smallint NOT NULL DEFAULT '0',
"site_project" text NOT NULL DEFAULT '',
PRIMARY KEY ("site_url")
);
create index "site_flags" on site ("site_flags");
@ -994,6 +995,7 @@ create index "site_sellpage" on site ("site_sellpage");
create index "site_realm" on site ("site_realm");
create index "site_valid" on site ("site_valid");
create index "site_dead" on site ("site_dead");
create index "site_project" on site ("site_project");
CREATE TABLE "source" (
"src_id" serial NOT NULL,

12
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1157 );
define( 'UPDATE_VERSION' , 1158 );
/**
*
@ -1774,3 +1774,13 @@ function update_r1155() {
function update_r1156() {
return UPDATE_SUCCESS;
}
function update_r1157() {
$r1 = q("alter table site add site_project char(255) not null default '' ");
$r2 = q("create index site_project on site ( site_project ) ");
if($r1 && $r2)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

1
mod/zfinger.php
View File

@ -248,6 +248,7 @@ function zfinger_init(&$a) {
if($dirmode != DIRECTORY_MODE_NORMAL)
$ret['site']['directory_url'] = z_root() . '/dirsearch';
$ret['site']['project'] = PLATFORM_NAME;
// hide detailed site information if you're off the grid

2
version.inc
View File

@ -1 +1 @@
2015-10-17.1188
2015-10-19.1190