Skip to content

a userek nevét írja ki.. #24

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
farkasalexa wants to merge 5 commits into
base: 7.x-1.x
Choose a base branch
from
Open

a userek nevét írja ki.. #24

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34b6022
a userek nevét írja ki..
farkasalexa May 3, 2012
d3c146a
Update shrtr.module
farkasalexa May 3, 2012
d9853f3
Update shrtr.module
farkasalexa May 3, 2012
590a883
Update shrtr.module
farkasalexa May 3, 2012
e6ad50d
Username változtatva
farkasalexa May 3, 2012
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
30 changes: 17 additions & 13 deletions shrtr.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,25 +196,29 @@ function shrtr_list_page() {

$header = array(t('ID'), t('User'), t('Original URL'), t('New URL'), t('Subbmitted'), t('Expire time'));
$rows = array();

while ($url = $urls->fetchAssoc()) {
$new_url = $base_url . '/shrtr/' . $url['alias'];
$row = array();
$row[] = $url['id'];
$row[] = $url['uid'];
$row[] = l($url['url'], $url['url']);
$row[] = l($new_url, $new_url);
$row[] = format_date($url['created']);
$row[] = format_date($url['expire']);
$rows[] = $row;

while ($url = $urls->fetchAssoc()) {
$new_url = $base_url . '/shrtr/' . $url['alias'];
$row = array();
$row[] = $url['id'];
if($url['uid'] == 0) {
$row[] = variable_get('anonymous', t('Anonymus'));
}
else{
$row[] = user_load($url['uid'])->name;
}
$row[] = $url['url'];
$row[] = l($new_url, $new_url);
$row[] = format_date($url['created']);
$row[] = format_date($url['expire']);
$rows[] = $row;
}

$content['table'] = array(
'#theme' => 'table',
'#header' => $header,
'#rows' => $rows,
);

return $content;
}

Expand All @@ -234,7 +238,7 @@ function shrtr_urls_admin() {
$row = array();
$row[] = $url['id'];
$row[] = $url['enabled'];
$row[] = $url['uid'];
$row[] = user_load($url['uid'])->name;
$row[] = l($url['url'], $url['url']);
$row[] = l($new_url, $new_url);
$row[] = format_date($url['created']);
Expand Down