Merge pull request #42 from MrPetovan/task/upgrade-to-utf8mb4
Upgrade database to utf8mb4
This commit is contained in:
Hypolite Petovan
GitHub
commit
54f9bd695a
283
dfrndir.sql
283
dfrndir.sql
|
|
@ -13,11 +13,12 @@ SET time_zone = "+00:00";
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `flag` (
|
||||
`id` int(11) NOT NULL,
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`pid` int(11) NOT NULL,
|
||||
`reason` int(11) NOT NULL,
|
||||
`total` int(11) NOT NULL DEFAULT '0'
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`total` int(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -26,11 +27,12 @@ CREATE TABLE IF NOT EXISTS `flag` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `photo` (
|
||||
`id` int(10) UNSIGNED NOT NULL,
|
||||
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`profile-id` int(11) NOT NULL,
|
||||
`data` mediumblob NOT NULL,
|
||||
`score` float NOT NULL DEFAULT '0'
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`score` float NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=2516 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -39,7 +41,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `profile` (
|
||||
`id` int(11) NOT NULL,
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` char(255) NOT NULL,
|
||||
`nurl` char(255) NOT NULL,
|
||||
`comm` tinyint(1) NOT NULL DEFAULT '0',
|
||||
|
|
@ -50,12 +52,21 @@ CREATE TABLE IF NOT EXISTS `profile` (
|
|||
`country-name` char(255) NOT NULL,
|
||||
`homepage` char(255) NOT NULL,
|
||||
`photo` char(255) NOT NULL,
|
||||
`tags` mediumtext NOT NULL,
|
||||
`tags` longtext NOT NULL,
|
||||
`available` tinyint(1) NOT NULL DEFAULT '1',
|
||||
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
`censored` tinyint(4) NOT NULL DEFAULT '0'
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
`censored` tinyint(4) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `name` (`name`(250)),
|
||||
KEY `nurl` (`nurl`(250)),
|
||||
KEY `comm` (`comm`),
|
||||
KEY `pdesc` (`pdesc`(250)),
|
||||
KEY `locality` (`locality`(250)),
|
||||
KEY `region` (`region`(250)),
|
||||
KEY `country-name` (`country-name`(250)),
|
||||
KEY `homepage` (`homepage`(250))
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=2518 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -64,11 +75,14 @@ CREATE TABLE IF NOT EXISTS `profile` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `session` (
|
||||
`id` bigint(20) UNSIGNED NOT NULL,
|
||||
`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`sid` char(255) NOT NULL,
|
||||
`data` text NOT NULL,
|
||||
`expire` int(10) UNSIGNED NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`data` mediumtext NOT NULL,
|
||||
`expire` int(10) UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `sid` (`sid`(250)),
|
||||
KEY `expire` (`expire`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=22917 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -77,17 +91,18 @@ CREATE TABLE IF NOT EXISTS `session` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `site` (
|
||||
`id` int(11) NOT NULL,
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` char(255) NOT NULL,
|
||||
`url` char(255) NOT NULL,
|
||||
`version` char(16) NOT NULL,
|
||||
`plugins` text NOT NULL,
|
||||
`plugins` mediumtext NOT NULL,
|
||||
`reg_policy` char(32) NOT NULL,
|
||||
`info` text NOT NULL,
|
||||
`info` mediumtext NOT NULL,
|
||||
`admin_name` char(255) NOT NULL,
|
||||
`admin_profile` char(255) NOT NULL,
|
||||
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -96,7 +111,7 @@ CREATE TABLE IF NOT EXISTS `site` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `site-health` (
|
||||
`id` int(10) UNSIGNED NOT NULL,
|
||||
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`base_url` varchar(255) NOT NULL,
|
||||
`effective_base_url` varchar(255) DEFAULT NULL,
|
||||
`health_score` int(11) NOT NULL DEFAULT '0',
|
||||
|
|
@ -107,14 +122,18 @@ CREATE TABLE IF NOT EXISTS `site-health` (
|
|||
`dt_last_heartbeat` datetime DEFAULT NULL,
|
||||
`name` varchar(255) DEFAULT NULL,
|
||||
`version` varchar(255) DEFAULT NULL,
|
||||
`plugins` text,
|
||||
`addons` mediumtext,
|
||||
`reg_policy` char(32) DEFAULT NULL,
|
||||
`info` text,
|
||||
`info` mediumtext,
|
||||
`admin_name` varchar(255) DEFAULT NULL,
|
||||
`admin_profile` varchar(255) DEFAULT NULL,
|
||||
`ssl_state` bit(1) DEFAULT NULL,
|
||||
`ssl_grade` varchar(3) DEFAULT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`ssl_grade` varchar(3) DEFAULT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `base_url` (`base_url`(250)),
|
||||
KEY `health_score` (`health_score`),
|
||||
KEY `dt_last_seen` (`dt_last_seen`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=10035 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -123,11 +142,14 @@ CREATE TABLE IF NOT EXISTS `site-health` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `site-probe` (
|
||||
`id` int(10) UNSIGNED NOT NULL,
|
||||
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`site_health_id` int(10) UNSIGNED NOT NULL,
|
||||
`dt_performed` datetime NOT NULL,
|
||||
`request_time` int(10) UNSIGNED NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`request_time` int(10) UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `site_health_id` (`site_health_id`),
|
||||
KEY `dt_performed` (`dt_performed`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=28987 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -136,14 +158,17 @@ CREATE TABLE IF NOT EXISTS `site-probe` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `site-scrape` (
|
||||
`id` int(10) UNSIGNED NOT NULL,
|
||||
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`site_health_id` int(10) UNSIGNED NOT NULL,
|
||||
`dt_performed` datetime NOT NULL,
|
||||
`request_time` int(10) UNSIGNED NOT NULL,
|
||||
`scrape_time` int(10) UNSIGNED NOT NULL,
|
||||
`photo_time` int(10) UNSIGNED NOT NULL,
|
||||
`total_time` int(10) UNSIGNED NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`total_time` int(10) UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `site_health_id` (`site_health_id`),
|
||||
KEY `dt_performed` (`dt_performed`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=177675 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -152,8 +177,9 @@ CREATE TABLE IF NOT EXISTS `site-scrape` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `sync-pull-queue` (
|
||||
`url` varchar(255) NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`url` varchar(255) CHARACTER SET utf8 NOT NULL,
|
||||
PRIMARY KEY (`url`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -162,8 +188,9 @@ CREATE TABLE IF NOT EXISTS `sync-pull-queue` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `sync-push-queue` (
|
||||
`url` varchar(255) NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`url` varchar(255) CHARACTER SET utf8 NOT NULL,
|
||||
PRIMARY KEY (`url`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -172,11 +199,14 @@ CREATE TABLE IF NOT EXISTS `sync-push-queue` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `sync-targets` (
|
||||
`base_url` varchar(255) NOT NULL,
|
||||
`base_url` varchar(255) CHARACTER SET utf8 NOT NULL,
|
||||
`pull` bit(1) NOT NULL DEFAULT b'0',
|
||||
`push` bit(1) NOT NULL DEFAULT b'1',
|
||||
`dt_last_pull` bigint(20) UNSIGNED DEFAULT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`dt_last_pull` bigint(20) UNSIGNED DEFAULT NULL,
|
||||
PRIMARY KEY (`base_url`),
|
||||
KEY `push` (`push`),
|
||||
KEY `pull` (`pull`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -186,8 +216,10 @@ CREATE TABLE IF NOT EXISTS `sync-targets` (
|
|||
|
||||
CREATE TABLE IF NOT EXISTS `sync-timestamps` (
|
||||
`url` varchar(255) NOT NULL,
|
||||
`modified` datetime NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`modified` datetime NOT NULL,
|
||||
PRIMARY KEY (`url`),
|
||||
KEY `modified` (`modified`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -196,10 +228,13 @@ CREATE TABLE IF NOT EXISTS `sync-timestamps` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `tag` (
|
||||
`id` int(11) NOT NULL,
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`term` char(255) NOT NULL,
|
||||
`nurl` char(255) NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`nurl` char(255) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `term` (`term`(250)),
|
||||
KEY `nurl` (`nurl`(250))
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=101679 DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
@ -208,174 +243,18 @@ CREATE TABLE IF NOT EXISTS `tag` (
|
|||
--
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `user` (
|
||||
`uid` int(11) NOT NULL,
|
||||
`uid` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`email` char(255) NOT NULL,
|
||||
`password` char(255) NOT NULL
|
||||
) DEFAULT CHARSET=utf8;
|
||||
`password` char(255) NOT NULL,
|
||||
PRIMARY KEY (`uid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
--
|
||||
-- Indexes for dumped tables
|
||||
--
|
||||
|
||||
--
|
||||
-- Indexes for table `flag`
|
||||
--
|
||||
ALTER TABLE `flag`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
|
||||
--
|
||||
-- Indexes for table `photo`
|
||||
--
|
||||
ALTER TABLE `photo`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
|
||||
--
|
||||
-- Indexes for table `profile`
|
||||
--
|
||||
ALTER TABLE `profile`
|
||||
ADD PRIMARY KEY (`id`),
|
||||
ADD KEY `name` (`name`),
|
||||
ADD KEY `nurl` (`nurl`),
|
||||
ADD KEY `comm` (`comm`),
|
||||
ADD KEY `pdesc` (`pdesc`),
|
||||
ADD KEY `locality` (`locality`),
|
||||
ADD KEY `region` (`region`),
|
||||
ADD KEY `country-name` (`country-name`),
|
||||
ADD KEY `homepage` (`homepage`);
|
||||
ALTER TABLE `profile` ADD FULLTEXT KEY `tags` (`tags`);
|
||||
ALTER TABLE `profile` ADD FULLTEXT KEY `profile-ft` (`name`,`pdesc`,`homepage`,`locality`,`region`,`country-name`,`tags`);
|
||||
|
||||
--
|
||||
-- Indexes for table `session`
|
||||
--
|
||||
ALTER TABLE `session`
|
||||
ADD PRIMARY KEY (`id`),
|
||||
ADD KEY `sid` (`sid`),
|
||||
ADD KEY `expire` (`expire`);
|
||||
|
||||
--
|
||||
-- Indexes for table `site`
|
||||
--
|
||||
ALTER TABLE `site`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
|
||||
--
|
||||
-- Indexes for table `site-health`
|
||||
--
|
||||
ALTER TABLE `site-health`
|
||||
ADD PRIMARY KEY (`id`),
|
||||
ADD KEY `base_url` (`base_url`),
|
||||
ADD KEY `health_score` (`health_score`),
|
||||
ADD KEY `dt_last_seen` (`dt_last_seen`);
|
||||
|
||||
--
|
||||
-- Indexes for table `site-probe`
|
||||
--
|
||||
ALTER TABLE `site-probe`
|
||||
ADD PRIMARY KEY (`id`),
|
||||
ADD KEY `site_health_id` (`site_health_id`),
|
||||
ADD KEY `dt_performed` (`dt_performed`);
|
||||
|
||||
--
|
||||
-- Indexes for table `site-scrape`
|
||||
--
|
||||
ALTER TABLE `site-scrape`
|
||||
ADD PRIMARY KEY (`id`),
|
||||
ADD KEY `site_health_id` (`site_health_id`),
|
||||
ADD KEY `dt_performed` (`dt_performed`);
|
||||
|
||||
--
|
||||
-- Indexes for table `sync-pull-queue`
|
||||
--
|
||||
ALTER TABLE `sync-pull-queue`
|
||||
ADD PRIMARY KEY (`url`);
|
||||
|
||||
--
|
||||
-- Indexes for table `sync-push-queue`
|
||||
--
|
||||
ALTER TABLE `sync-push-queue`
|
||||
ADD PRIMARY KEY (`url`);
|
||||
|
||||
--
|
||||
-- Indexes for table `sync-targets`
|
||||
--
|
||||
ALTER TABLE `sync-targets`
|
||||
ADD PRIMARY KEY (`base_url`),
|
||||
ADD KEY `push` (`push`),
|
||||
ADD KEY `pull` (`pull`);
|
||||
|
||||
--
|
||||
-- Indexes for table `sync-timestamps`
|
||||
--
|
||||
ALTER TABLE `sync-timestamps`
|
||||
ADD PRIMARY KEY (`url`),
|
||||
ADD KEY `modified` (`modified`);
|
||||
|
||||
--
|
||||
-- Indexes for table `tag`
|
||||
--
|
||||
ALTER TABLE `tag`
|
||||
ADD PRIMARY KEY (`id`),
|
||||
ADD KEY `term` (`term`),
|
||||
ADD KEY `nurl` (`nurl`);
|
||||
|
||||
--
|
||||
-- Indexes for table `user`
|
||||
--
|
||||
ALTER TABLE `user`
|
||||
ADD PRIMARY KEY (`uid`);
|
||||
|
||||
--
|
||||
-- AUTO_INCREMENT for dumped tables
|
||||
--
|
||||
|
||||
--
|
||||
-- AUTO_INCREMENT for table `flag`
|
||||
--
|
||||
ALTER TABLE `flag`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `photo`
|
||||
--
|
||||
ALTER TABLE `photo`
|
||||
MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `profile`
|
||||
--
|
||||
ALTER TABLE `profile`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `session`
|
||||
--
|
||||
ALTER TABLE `session`
|
||||
MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `site`
|
||||
--
|
||||
ALTER TABLE `site`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `site-health`
|
||||
--
|
||||
ALTER TABLE `site-health`
|
||||
MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `site-probe`
|
||||
--
|
||||
ALTER TABLE `site-probe`
|
||||
MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `site-scrape`
|
||||
--
|
||||
ALTER TABLE `site-scrape`
|
||||
MODIFY `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `tag`
|
||||
--
|
||||
ALTER TABLE `tag`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `user`
|
||||
--
|
||||
ALTER TABLE `user`
|
||||
MODIFY `uid` int(11) NOT NULL AUTO_INCREMENT;
|
||||
|
|
@ -208,12 +208,19 @@ if (!function_exists('run_site_probe')) {
|
|||
$time
|
||||
);
|
||||
|
||||
if (isset($data->addons)) {
|
||||
$addons = $data->addons;
|
||||
} else {
|
||||
// Backward compatibility
|
||||
$addons = $data->plugins;
|
||||
}
|
||||
|
||||
//Update any health calculations or otherwise processed data.
|
||||
$parsedDataQuery .= sprintf(
|
||||
"`dt_last_seen` = NOW(),
|
||||
`name` = '%s',
|
||||
`version` = '%s',
|
||||
`plugins` = '%s',
|
||||
`addons` = '%s',
|
||||
`reg_policy` = '%s',
|
||||
`info` = '%s',
|
||||
`admin_name` = '%s',
|
||||
|
|
@ -221,7 +228,7 @@ if (!function_exists('run_site_probe')) {
|
|||
",
|
||||
dbesc($data->site_name),
|
||||
dbesc($data->version),
|
||||
dbesc(implode("\r\n", $data->plugins)),
|
||||
dbesc(implode("\r\n", $data->addons)),
|
||||
dbesc($data->register_policy),
|
||||
dbesc($data->info),
|
||||
dbesc($data->admin->name),
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@ function health_details(App $a, $id)
|
|||
'$dt_first_noticed' => $site['dt_first_noticed'],
|
||||
'$dt_last_seen' => $site['dt_last_seen'],
|
||||
'$version' => $site['version'],
|
||||
'$plugins' => $site['plugins'],
|
||||
'$addons' => $site['addons'],
|
||||
'$reg_policy' => $site['reg_policy'],
|
||||
'$info' => $site['info'],
|
||||
'$admin_name' => $site['admin_name'],
|
||||
|
|
|
|||
|
|
@ -58,28 +58,28 @@ function servers_content(&$a) {
|
|||
$site['users'] = $users;
|
||||
|
||||
//Figure out what this server supports.
|
||||
$plugins = explode("\r\n", $site['plugins']);
|
||||
$site['plugins'] = $plugins;
|
||||
$hasPlugin = function (array $input) use ($plugins) {
|
||||
return !!count(array_intersect($input, $plugins));
|
||||
$addons = explode("\r\n", $site['addons']);
|
||||
$site['addons'] = $addons;
|
||||
$hasAddon = function (array $input) use ($addons) {
|
||||
return !!count(array_intersect($input, $addons));
|
||||
};
|
||||
|
||||
$site['supports'] = array(
|
||||
'HTTPS' => $site['ssl_state'] == 1,
|
||||
'Twitter' => $hasPlugin(array('buffer', 'twitter')),
|
||||
'Facebook' => $hasPlugin(array('buffer')),
|
||||
'Google+' => $hasPlugin(array('buffer', 'gpluspost')),
|
||||
'Twitter' => $hasAddon(array('buffer', 'twitter')),
|
||||
'Facebook' => $hasAddon(array('buffer')),
|
||||
'Google+' => $hasAddon(array('buffer', 'gpluspost')),
|
||||
'RSS/Atom' => true, //Built-in.
|
||||
'Diaspora*' => $hasPlugin(array('diaspora')),
|
||||
'pump.io' => $hasPlugin(array('pumpio')),
|
||||
'StatusNet' => $hasPlugin(array('statusnet')),
|
||||
'Tumblr' => $hasPlugin(array('tumblr')),
|
||||
'Blogger' => $hasPlugin(array('blogger')),
|
||||
'Dreamwidth' => $hasPlugin(array('dwpost')),
|
||||
'Wordpress' => $hasPlugin(array('wppost')),
|
||||
'LiveJournal' => $hasPlugin(array('ljpost')),
|
||||
'Insanejournal' => $hasPlugin(array('ijpost')),
|
||||
'Libertree' => $hasPlugin(array('libertree'))
|
||||
'Diaspora*' => $hasAddon(array('diaspora')),
|
||||
'pump.io' => $hasAddon(array('pumpio')),
|
||||
'StatusNet' => $hasAddon(array('statusnet')),
|
||||
'Tumblr' => $hasAddon(array('tumblr')),
|
||||
'Blogger' => $hasAddon(array('blogger')),
|
||||
'Dreamwidth' => $hasAddon(array('dwpost')),
|
||||
'Wordpress' => $hasAddon(array('wppost')),
|
||||
'LiveJournal' => $hasAddon(array('ljpost')),
|
||||
'Insanejournal' => $hasAddon(array('ijpost')),
|
||||
'Libertree' => $hasAddon(array('libertree'))
|
||||
);
|
||||
|
||||
//Subset of the full support list, to show popular items.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
site_name
|
||||
version
|
||||
url
|
||||
plugins (arr)
|
||||
addons (arr)
|
||||
register_policy
|
||||
admin:
|
||||
name
|
||||
|
|
@ -26,7 +26,7 @@ function siteinfo_content(&$a) {
|
|||
$o .= '<p>Friendica is experiencing very rapid growth and we need more public portals - as some of our primary servers are reaching capacity. Friendica is a decentralised and distributed network. Help us share the load. If you can provide a Friendica server for public use, please send the URL to info at friendica dot com. We will include you in our list.</p>';
|
||||
|
||||
|
||||
$r = q("select * from site where url != '' and version != '' and not plugins like '%%testdrive%%' order by rand()");
|
||||
$r = q("select * from site where url != '' and version != '' and not addons like '%%testdrive%%' order by rand()");
|
||||
|
||||
$policy = array ( 'REGISTER_CLOSED' => 'closed', 'REGISTER_OPEN' => 'open', 'REGISTER_APPROVE' => 'requires approval');
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ function siteinfo_content(&$a) {
|
|||
$o .= '<td>' . t('Registration') . '</td>';
|
||||
$o .= '<td>' . t('Additional Info') . '</td>';
|
||||
$o .= '<td>' . t('Version') . '</td>';
|
||||
$o .= '<td>' . t('Plugins Installed') . '</td>';
|
||||
$o .= '<td>' . t('Addons Installed') . '</td>';
|
||||
$o .= '<td>' . t('Site Administrator') . '</td>';
|
||||
$o .= '<td>' . t('Record Updated (UTC)') . '</td>';
|
||||
$o .= '</tr>';
|
||||
|
|
@ -53,14 +53,14 @@ function siteinfo_content(&$a) {
|
|||
$o .= '<td>' . $policy[$rr['reg_policy']] . '</td>';
|
||||
$o .= '<td>' . $rr['info'] . '</td>';
|
||||
$o .= '<td>' . $rr['version'] . '</td>';
|
||||
$o .= '<td>' . str_replace(',',', ',$rr['plugins']) . '</td>';
|
||||
$o .= '<td>' . str_replace(',',', ',$rr['addons']) . '</td>';
|
||||
$o .= '<td>' . '<a href="' . $rr['admin_profile'] . '">' . $rr['admin_name'] . '</a>' . '</td>';
|
||||
$o .= '<td>' . $rr['updated'] . '</td>';
|
||||
$o .= '</tr>';
|
||||
}
|
||||
}
|
||||
|
||||
$r = q("select * from site where url != '' and version != '' and plugins like '%%testdrive%%' order by rand()");
|
||||
$r = q("select * from site where url != '' and version != '' and addons like '%%testdrive%%' order by rand()");
|
||||
|
||||
if(count($r)) {
|
||||
$o .= '<tr><td colspan="7" height="100px" ><strong>-- Demo and test sites -- Limited account duration with expiration --</stron></td></tr>';
|
||||
|
|
@ -72,7 +72,7 @@ function siteinfo_content(&$a) {
|
|||
$o .= '<td>' . $policy[$rr['reg_policy']] . '</td>';
|
||||
$o .= '<td>' . $rr['info'] . '</td>';
|
||||
$o .= '<td>' . $rr['version'] . '</td>';
|
||||
$o .= '<td>' . str_replace(',',', ',$rr['plugins']) . '</td>';
|
||||
$o .= '<td>' . str_replace(',',', ',$rr['addons']) . '</td>';
|
||||
$o .= '<td>' . '<a href="' . $rr['admin_profile'] . '">' . $rr['admin_name'] . '</a>' . '</td>';
|
||||
$o .= '<td>' . $rr['updated'] . '</td>';
|
||||
$o .= '</tr>';
|
||||
|
|
@ -94,5 +94,4 @@ function siteinfo_content(&$a) {
|
|||
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ function updatesites_content(&$a) {
|
|||
else
|
||||
continue;
|
||||
if($j) {
|
||||
$plugs = (array) $j->plugins;
|
||||
$plugs = (array) $j->addons;
|
||||
if(in_array('testdrive',$plugs)) {
|
||||
$j->site_name = '!!! Test/Demo ONLY. !!! ' . $j->site_name;
|
||||
$j->info = 'Accounts are temporary, expiration is enabled. ' . $j->info;
|
||||
|
|
@ -25,9 +25,9 @@ function updatesites_content(&$a) {
|
|||
|
||||
q("UPDATE site set
|
||||
name = '%s',
|
||||
url = '%s',
|
||||
url = '%s',
|
||||
version = '%s',
|
||||
plugins = '%s',
|
||||
addons = '%s',
|
||||
reg_policy = '%s',
|
||||
info = '%s',
|
||||
admin_name = '%s',
|
||||
|
|
|
|||
Loading…
Reference in New Issue