Skip to content

Adding "Mark Gone" capability to effectively remove a slug. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benschell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding "Mark Gone" capability to effectively remove a slug. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion -/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,24 @@ function bc_log($message){
}
elseif(isset($_GET['mark_gone']) && isset($_GET['slug']) && strlen(trim($_GET['slug'])))
{ // Mark a redirection as GONE
// TODO
$prefix = DB_PREFIX;
$slug = $_GET['slug'];

// Check if slug is in use
$stmt = $db->prepare("SELECT url, checksum, custom_url, redir_type FROM {$prefix}urls WHERE BINARY custom_url = BINARY :slug AND custom_url = :slug");
$stmt->execute(array('slug'=>$slug));
$row = $stmt->fetch(PDO::FETCH_ASSOC);
if($row){ // slug exists
$result = bcurls_update_slug($row['url'], $row['checksum'], $row['custom_url'], 'gone');
if($result !== true) {
$error = $insert_result;

@alanhogan alanhogan Jan 30, 2015

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does $insert_result come from? is this a magic PHP thing or a typo for $result?

include('pages/error.php');
exit;
}
}
// Redirect to the stats page
header('Location:?stats=1');

@alanhogan alanhogan Jan 30, 2015

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes sense in the UI but not as for API usages. Let's check the case, like above:

if (isset($_GET['api']))
    {
           echo 'deleted';
           exit;
    }
else
    {
        header('Location: ?stats=1');
    }

exit();
}
else
{
Expand Down
4 changes: 4 additions & 0 deletions -/pages/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<th>URL</th>
<th>Lessn'd</th>
<th>Hits</th>
<th>Active?</th>
<th>Mark Gone</th>
</tr>

<?php foreach($top_urls as $url) {
Expand All @@ -16,6 +18,8 @@
<td><?php echo htmlspecialchars($url['url'], ENT_QUOTES, 'UTF-8')?></td>
<td><!-- <a href="<?php /*=$short*/ ?>"> --><?php echo $short?><!-- </a> --></td>
<td><?php echo $url['hits']?></td>
<td><?php echo $url['redir_type'] == 'gone' ? 'Gone' : 'Active'; ?></td>
<td><?php if($url['redir_type'] != 'gone'){ ?><a href="?mark_gone=1&slug=<?php echo $url['custom_url']; ?>">Mark Gone</a><?php } ?></td>
</tr>
<?php } ?>

Expand Down
2 changes: 1 addition & 1 deletion -/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function record_stats($db, $url_id) {
}

function stats_top_urls($db, $count=10) {
$stmt = $db->query('SELECT u.id,u.url,u.custom_url,COUNT(s.url_id) as hits FROM '.DB_PREFIX.'urls u LEFT JOIN '.DB_PREFIX.'url_stats s ON u.id = s.url_id GROUP BY u.id,u.url ORDER BY hits desc LIMIT '.$count);
$stmt = $db->query('SELECT u.id,u.url,u.custom_url,u.redir_type,COUNT(s.url_id) as hits FROM '.DB_PREFIX.'urls u LEFT JOIN '.DB_PREFIX.'url_stats s ON u.id = s.url_id GROUP BY u.id,u.url ORDER BY hits desc LIMIT '.$count);
return $stmt->fetchAll(PDO::FETCH_ASSOC);
}

Expand Down