YGGverse
/
YGGo
mirror of https://github.com/YGGverse/YGGo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

delete getFoundHostPage method, update API version

main
ghost 1 year ago
parent
11e02da66d
commit
02612d098b
6 changed files with 103 additions and 129 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      config/app.php.txt
  2. 35
      library/mysql.php
  3. 4
      library/sphinxql.php
  4. 13
      public/api.php
  5. 134
      public/explore.php
  6. 44
      public/search.php

2
config/app.php.txt
Unescape View File

@ -396,7 +396,7 @@ define('CRAWL_MANIFEST', true);
* Manifest API version compatibility * Manifest API version compatibility
* *
*/ */
define('CRAWL_MANIFEST_API_VERSION', 0.10); define('CRAWL_MANIFEST_API_VERSION', 0.11);
/* /*
* Set default auto-crawl status for new manifest added * Set default auto-crawl status for new manifest added

35
library/mysql.php
Unescape View File

@ -295,41 +295,6 @@ class MySQL {
return $query->fetch(); return $query->fetch();
} }
public function getFoundHostPage(int $hostPageId) {
$query = $this->_db->prepare("SELECT `hostPage`.`hostPageId`,
`hostPage`.`uri`,
`hostPage`.`timeAdded`,
`hostPage`.`timeUpdated`,
`hostPage`.`mime`,
`hostPage`.`size`,
`host`.`scheme`,
`host`.`name`,
`host`.`port`,
IF (`host`.`port` IS NOT NULL,
CONCAT(`host`.`scheme`, '://', `host`.`name`, ':', `host`.`port`),
CONCAT(`host`.`scheme`, '://', `host`.`name`)
) AS `hostURL`,
IF (`host`.`port` IS NOT NULL,
CONCAT(`host`.`scheme`, '://', `host`.`name`, ':', `host`.`port`, `hostPage`.`uri`),
CONCAT(`host`.`scheme`, '://', `host`.`name`, `hostPage`.`uri`)
) AS `hostPageURL`
FROM `hostPage`
JOIN `host` ON (`host`.`hostId` = `hostPage`.`hostId`)
WHERE `hostPage`.`hostPageId` = ?
LIMIT 1");
$query->execute([$hostPageId]);
return $query->fetch();
}
public function addHostPage(int $hostId, public function addHostPage(int $hostId,
int $crc32uri, int $crc32uri,
string $uri, string $uri,

4
library/sphinxql.php
Unescape View File

@ -22,13 +22,13 @@ class SphinxQL {
public function searchHostPages(string $keyword, string $mime, int $start, int $limit, int $maxMatches) { public function searchHostPages(string $keyword, string $mime, int $start, int $limit, int $maxMatches) {
$query = $this->_sphinx->prepare("SELECT *, WEIGHT() + `rank` * IF (`rank` > 0, 1000, 1) AS `priority` $query = $this->_sphinx->prepare("SELECT *, WEIGHT() + `rank` * IF (`rank` > 0, 1000, 1) AS `weight`
FROM `hostPage` FROM `hostPage`
WHERE MATCH(?) AND `mime` = ? WHERE MATCH(?) AND `mime` = ?
ORDER BY `priority` DESC, WEIGHT() DESC ORDER BY `weight` DESC, WEIGHT() DESC
LIMIT " . (int) ($start >= $maxMatches ? ($maxMatches > 0 ? $maxMatches - 1 : 0) : $start) . "," . (int) $limit . " LIMIT " . (int) ($start >= $maxMatches ? ($maxMatches > 0 ? $maxMatches - 1 : 0) : $start) . "," . (int) $limit . "

13
public/api.php
Unescape View File

@ -1,7 +1,7 @@
<?php <?php
// Current version // Current version
define('API_VERSION', 0.10); define('API_VERSION', 0.11);
// Load system dependencies // Load system dependencies
require_once(__DIR__ . '/../config/app.php'); require_once(__DIR__ . '/../config/app.php');
@ -44,11 +44,16 @@ if (API_ENABLED) {
foreach ($sphinxResults as $i => $sphinxResult) { foreach ($sphinxResults as $i => $sphinxResult) {
if ($hostPage = $db->getFoundHostPage($sphinxResult->id)) { if ($hostPage = $db->getHostPage($sphinxResult->id)) {
$dbResults[$i] = $hostPage; if ($host = $db->getHost($hostPage->hostId)) {
$dbResults[$i]->weight = $sphinxResult->weight; $dbResults[$i] = $hostPage;
$dbResults[$i]->url = $host->url . $hostPage->uri;
$dbResults[$i]->weight = $sphinxResult->weight;
}
} }
} }

134
public/explore.php
Unescape View File

@ -203,81 +203,83 @@ $placeholder = Filter::plural($totalPages, [sprintf(_('Over %s page or enter the
</form> </form>
</header> </header>
<main> <main>
<?php if ($hostPage = $db->getFoundHostPage($hp)) { ?> <?php if ($hostPage = $db->getHostPage($hp)) { ?>
<div> <?php if ($host = $db->getHost($hostPage->hostId)) { ?>
<?php if ($hostPageDescription = $db->getLastPageDescription($hp)) { ?> <div>
<?php if (!empty($hostPageDescription->title)) { ?> <?php if ($hostPageDescription = $db->getLastPageDescription($hp)) { ?>
<h2><?php echo htmlentities($hostPageDescription->title) ?></h2> <?php if (!empty($hostPageDescription->title)) { ?>
<h2><?php echo htmlentities($hostPageDescription->title) ?></h2>
<?php } ?>
<?php if (!empty($hostPageDescription->description)) { ?>
<span><?php echo htmlentities($hostPageDescription->description) ?></span>
<?php } ?>
<?php if (!empty($hostPageDescription->keywords)) { ?>
<span><?php echo htmlentities($hostPageDescription->keywords) ?></span>
<?php } ?>
<?php } ?> <?php } ?>
<?php if (!empty($hostPageDescription->description)) { ?> <a href="<?php echo urldecode($host->url . $hostPage->uri) ?>">
<span><?php echo htmlentities($hostPageDescription->description) ?></span> <img src="<?php echo WEBSITE_DOMAIN; ?>/file.php?type=identicon&query=<?php echo urlencode($host->name) ?>" alt="identicon" width="16" height="16" class="icon" />
<?php echo htmlentities(urldecode($host->url . $hostPage->uri)) ?>
</a>
</div>
<div>
<?php if (!empty($hostPage->mime)) { ?>
<p><?php echo _('MIME') ?></p>
<p><?php echo $hostPage->mime ?></p>
<?php } ?> <?php } ?>
<?php if (!empty($hostPageDescription->keywords)) { ?> <?php if (!empty($hostPage->size)) { ?>
<span><?php echo htmlentities($hostPageDescription->keywords) ?></span> <p><?php echo _('Size') ?></p>
<p><?php echo $hostPage->size ?></p>
<?php } ?> <?php } ?>
<?php } ?> <?php if (!empty($hostPage->timeAdded)) { ?>
<a href="<?php echo $hostPage->hostPageURL ?>"> <p><?php echo _('Time added') ?></p>
<img src="<?php echo WEBSITE_DOMAIN; ?>/file.php?type=identicon&query=<?php echo urlencode($hostPage->name) ?>" alt="identicon" width="16" height="16" class="icon" /> <p><?php echo date('c', $hostPage->timeAdded) ?></p>
<?php echo htmlentities(urldecode($hostPage->hostURL) . urldecode($hostPage->uri)) ?>
</a>
</div>
<div>
<?php if (!empty($hostPage->mime)) { ?>
<p><?php echo _('MIME') ?></p>
<p><?php echo $hostPage->mime ?></p>
<?php } ?>
<?php if (!empty($hostPage->size)) { ?>
<p><?php echo _('Size') ?></p>
<p><?php echo $hostPage->size ?></p>
<?php } ?>
<?php if (!empty($hostPage->timeAdded)) { ?>
<p><?php echo _('Time added') ?></p>
<p><?php echo date('c', $hostPage->timeAdded) ?></p>
<?php } ?>
<?php if (!empty($hostPage->timeUpdated)) { ?>
<p><?php echo _('Time updated') ?></p>
<p><?php echo date('c', $hostPage->timeUpdated) ?></p>
<?php } ?>
<?php $totalHostPageSnaps = $db->getTotalHostPageSnaps($hp); ?>
<p>
<?php echo $totalHostPageSnaps ? Filter::plural($totalHostPageSnaps, [sprintf(_('%s snap'), $totalHostPageSnaps),
sprintf(_('%s snaps'), $totalHostPageSnaps),
sprintf(_('%s snaps'), $totalHostPageSnaps)]) : false ?>
</p>
<?php if ($totalHostPageSnaps) { ?>
<?php foreach ($db->getHostPageSnaps($hp) as $hostPageSnap) { ?>
<p>
<a href="<?php echo WEBSITE_DOMAIN . '/file.php?type=snap&hps=' . $hostPageSnap->hostPageSnapId ?>">
<?php echo date('c', $hostPageSnap->timeAdded) ?>
</a>
</p>
<?php } ?> <?php } ?>
<?php } ?> <?php if (!empty($hostPage->timeUpdated)) { ?>
<?php $totalHostPageIdSources = $db->getTotalHostPagesToHostPageByHostPageIdTarget($hp); ?> <p><?php echo _('Time updated') ?></p>
<p> <p><?php echo date('c', $hostPage->timeUpdated) ?></p>
<?php echo $totalHostPageIdSources ? Filter::plural($totalHostPageIdSources, [sprintf(_('%s referrer'), $totalHostPageIdSources), <?php } ?>
sprintf(_('%s referrers'), $totalHostPageIdSources), <?php $totalHostPageSnaps = $db->getTotalHostPageSnaps($hp); ?>
sprintf(_('%s referrers'), $totalHostPageIdSources)]) : false ?> <p>
</p> <?php echo $totalHostPageSnaps ? Filter::plural($totalHostPageSnaps, [sprintf(_('%s snap'), $totalHostPageSnaps),
<?php if ($totalHostPageIdSources) { ?> sprintf(_('%s snaps'), $totalHostPageSnaps),
<?php foreach ($db->getHostPagesToHostPageByHostPageIdTarget($hp) as $hostPageIdSource) { ?> sprintf(_('%s snaps'), $totalHostPageSnaps)]) : false ?>
<?php if ($hostPage = $db->getFoundHostPage($hostPageIdSource->hostPageIdSource)) { ?> </p>
<?php $hostPageDescription = $db->getLastPageDescription($hostPageIdSource->hostPageIdSource); ?> <?php if ($totalHostPageSnaps) { ?>
<?php foreach ($db->getHostPageSnaps($hp) as $hostPageSnap) { ?>
<p> <p>
<a href="<?php echo $hostPage->hostPageURL ?>" <a href="<?php echo WEBSITE_DOMAIN . '/file.php?type=snap&hps=' . $hostPageSnap->hostPageSnapId ?>">
title="<?php echo (!empty($hostPageDescription->title) ? $hostPageDescription->title : (!empty($hostPageDescription->description) ? $hostPageDescription->description : false)) ?>"> <?php echo date('c', $hostPageSnap->timeAdded) ?>
<img src="<?php echo WEBSITE_DOMAIN; ?>/file.php?type=identicon&query=<?php echo urlencode($hostPage->name) ?>" alt="identicon" width="16" height="16" class="icon" />
<?php echo htmlentities(urldecode($hostPage->hostURL) . (mb_strlen(urldecode($hostPage->uri)) > 32 ? '...' . mb_substr(urldecode($hostPage->uri), -32) : urldecode($hostPage->uri))) ?>
</a>
|
<a href="<?php echo WEBSITE_DOMAIN; ?>/explore.php?hp=<?php echo $hostPage->hostPageId ?>">
<?php echo _('explore'); ?>
</a> </a>
</p> </p>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<?php } ?> <?php $totalHostPageIdSources = $db->getTotalHostPagesToHostPageByHostPageIdTarget($hp); ?>
</div> <p>
<?php echo $totalHostPageIdSources ? Filter::plural($totalHostPageIdSources, [sprintf(_('%s referrer'), $totalHostPageIdSources),
sprintf(_('%s referrers'), $totalHostPageIdSources),
sprintf(_('%s referrers'), $totalHostPageIdSources)]) : false ?>
</p>
<?php if ($totalHostPageIdSources) { ?>
<?php foreach ($db->getHostPagesToHostPageByHostPageIdTarget($hp) as $hostPageIdSource) { ?>
<?php if ($hostPage = $db->getHostPage($hostPageIdSource->hostPageIdSource)) { ?>
<?php if ($host = $db->getHost($hostPage->hostId)) { ?>
<p>
<a href="<?php echo urldecode($host->url . $hostPage->uri) ?>">
<img src="<?php echo WEBSITE_DOMAIN; ?>/file.php?type=identicon&query=<?php echo urlencode($host->name) ?>" alt="identicon" width="16" height="16" class="icon" />
<?php echo htmlentities(urldecode($host->url) . (mb_strlen(urldecode($hostPage->uri)) > 28 ? '...' . mb_substr(urldecode($hostPage->uri), -28) : urldecode($hostPage->uri))) ?>
</a>
|
<a href="<?php echo WEBSITE_DOMAIN; ?>/explore.php?hp=<?php echo $hostPage->hostPageId ?>">
<?php echo _('explore'); ?>
</a>
</p>
<?php } ?>
<?php } ?>
<?php } ?>
<?php } ?>
</div>
<?php } ?>
<?php } else { ?> <?php } else { ?>
<div style="text-align:center"> <div style="text-align:center">
<span><?php echo _('Not found') ?></span> <span><?php echo _('Not found') ?></span>

44
public/search.php
Unescape View File

@ -318,28 +318,30 @@ if (filter_var($q, FILTER_VALIDATE_URL) && preg_match(CRAWL_URL_REGEXP, $q)) {
<?php } ?> <?php } ?>
</div> </div>
<?php foreach ($results as $result) { ?> <?php foreach ($results as $result) { ?>
<?php if ($hostPage = $db->getFoundHostPage($result->id)) { ?> <?php if ($hostPage = $db->getHostPage($result->id)) { ?>
<div> <?php if ($host = $db->getHost($hostPage->hostId)) { ?>
<?php if ($hostPageDescription = $db->getLastPageDescription($result->id)) { ?> <div>
<?php if (!empty($hostPageDescription->title)) { ?> <?php if ($hostPageDescription = $db->getLastPageDescription($result->id)) { ?>
<h2><?php echo $hostPageDescription->title ?></h2> <?php if (!empty($hostPageDescription->title)) { ?>
<h2><?php echo $hostPageDescription->title ?></h2>
<?php } ?>
<?php if (!empty($hostPageDescription->description)) { ?>
<span><?php echo $hostPageDescription->description ?></span>
<?php } ?>
<?php if (!empty($hostPageDescription->keywords)) { ?>
<span><?php echo $hostPageDescription->keywords ?></span>
<?php } ?>
<?php } ?> <?php } ?>
<?php if (!empty($hostPageDescription->description)) { ?> <a href="<?php echo urldecode($host->url . $hostPage->uri) ?>">
<span><?php echo $hostPageDescription->description ?></span> <img src="<?php echo WEBSITE_DOMAIN; ?>/file.php?type=identicon&query=<?php echo urlencode($host->name) ?>" alt="identicon" width="16" height="16" class="icon" />
<?php } ?> <?php echo htmlentities(urldecode($host->url) . (mb_strlen(urldecode($hostPage->uri)) > 28 ? '...' . mb_substr(urldecode($hostPage->uri), -28) : urldecode($hostPage->uri))) ?>
<?php if (!empty($hostPageDescription->keywords)) { ?> </a>
<span><?php echo $hostPageDescription->keywords ?></span> |
<?php } ?> <a href="<?php echo WEBSITE_DOMAIN; ?>/explore.php?hp=<?php echo $result->id ?>">
<?php } ?> <?php echo _('explore'); ?>
<a href="<?php echo $hostPage->hostPageURL ?>"> </a>
<img src="<?php echo WEBSITE_DOMAIN; ?>/file.php?type=identicon&query=<?php echo urlencode($hostPage->name) ?>" alt="identicon" width="16" height="16" class="icon" /> </div>
<?php echo htmlentities(urldecode($hostPage->hostURL) . (mb_strlen(urldecode($hostPage->uri)) > 28 ? '...' . mb_substr(urldecode($hostPage->uri), -28) : urldecode($hostPage->uri))) ?> <?php } ?>
</a>
|
<a href="<?php echo WEBSITE_DOMAIN; ?>/explore.php?hp=<?php echo $result->id ?>">
<?php echo _('explore'); ?>
</a>
</div>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<?php if ($p * WEBSITE_PAGINATION_SEARCH_PAGE_RESULTS_LIMIT <= $resultsTotal) { ?> <?php if ($p * WEBSITE_PAGINATION_SEARCH_PAGE_RESULTS_LIMIT <= $resultsTotal) { ?>

Write Preview
Loading…
Cancel
Save