Skip to content

Hit counter cucc #25

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

Hit counter cucc #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
662824e
Update shrtr.module
Astiii May 3, 2012
6d29903
Update shrtr.install
Astiii 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
21 changes: 21 additions & 0 deletions shrtr.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ function shrtr_schema() {
'default' => 1,
'length' => 1,
),
'hits' => array(
'description' => 'Hits',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
),
),
'primary key' => array('id'),
'unique keys' => array(
Expand All @@ -64,3 +70,18 @@ function shrtr_schema() {
);
return $schema;
}

/**
* Creates hit counter field.
*/
function shrtr_update_7901() {
$hits = array(
'description' => 'Hits',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
);
db_add_field('shrtr_urls', 'expire', $hits);

return t('Hit counter field of added to database.');
}
58 changes: 25 additions & 33 deletions shrtr.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ function shrtr_permission() {
),
);
}

/**
* Implements hook_menu().
*/
Expand Down Expand Up @@ -34,26 +35,12 @@ function shrtr_menu() {
'page callback' => 'shrtr_list_page',
'access arguments' => array('access content'),
);
$items['admin/config/content/shrtr'] = array(
'title' => 'Expire time enable/disable',
'page callback' => 'drupal_get_form',
'page arguments' => array('shrtr_admin_page'),
'access arguments' => array('access content'),
);
return $items;
}

function shrtr_admin_page(){
$form['shrtr_expire_disable'] = array(
'#type' => 'checkbox',
'#default_value' => variable_get('shrtr_expire_disable',0),
'#title' => t('Expire Time Disable'),
);
return system_settings_form($form);
return $items;
}

/**
* Returns a form array for submit new ULR-s.
* Returns a form array for submit new URL-s.
*/
function shrtr_new_form($form = array(), &$form_state) {
$form['url'] = array(
Expand All @@ -65,20 +52,17 @@ function shrtr_new_form($form = array(), &$form_state) {
$form['message'] = array(
'#markup' => t('Give a URL to shorten.'),
);
$enable_disable = variable_get('shrtr_expire_disable', 0);
if($enable_disable == 0){
$form['expire'] = array(
'#type' => 'select',
'#title' => t('Expire'),
'#options' => array(
0 => t('Never'),
600 => '10' . t('min'),
1200 => '20' . t('min'),
),
'#default_value' => 0,
'#description' => t('Time to expire'),
);
}
$form['expire'] = array(
'#type' => 'select',
'#title' => t('Expire'),
'#options' => array(
0 => t('Never'),
600 => '10' . t('min'),
1200 => '20' . t('min'),
),
'#default_value' => 0,
'#description' => t('Time to expire'),
);
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Submit'),
Expand Down Expand Up @@ -136,6 +120,7 @@ function shrtr_new_form_submit($form, &$form_state) {
'uid' => $user->uid,
'created' => REQUEST_TIME,
'expire' => $expire,
'hits' => $hits,
'alias' => $alias,
);

Expand All @@ -149,12 +134,17 @@ function shrtr_new_form_submit($form, &$form_state) {
*/
function shrtr_goto($alias) {
$result = db_select('shrtr_urls', 's')
->fields('s', array('url', 'expire'))
->fields('s', array('url', 'expire', 'hits'))
->condition('alias', $alias)
->execute()
->fetchAssoc();

if ($result['expire'] == 0 || $result['expire'] > REQUEST_TIME) {
$ujhit = $result['hits'] + 1;
db_update('shrtr_urls')
->fields(array('hits' => $ujhit))
->condition('alias', $alias)
->execute();
drupal_goto($result['url']);
}
else {
Expand Down Expand Up @@ -194,7 +184,7 @@ function shrtr_list_page() {
->fields('s')
->execute();

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

while ($url = $urls->fetchAssoc()) {
Expand All @@ -206,6 +196,7 @@ function shrtr_list_page() {
$row[] = l($new_url, $new_url);
$row[] = format_date($url['created']);
$row[] = format_date($url['expire']);
$row[] = $url['hits'];
$rows[] = $row;
}

Expand All @@ -225,7 +216,7 @@ function shrtr_urls_admin() {
->fields('s')
->execute();

$header = array(t('ID'), t('Enabled'), t('User'), t('Original URL'), t('New URL'), t('Subbmitted'), t('Expire time'));
$header = array(t('ID'), t('Enabled'), t('User'), t('Original URL'), t('New URL'), t('Submitted'), t('Expire time'), t('Number of hits'));
$rows = array();
$default = array();

Expand All @@ -239,6 +230,7 @@ function shrtr_urls_admin() {
$row[] = l($new_url, $new_url);
$row[] = format_date($url['created']);
$row[] = format_date($url['expire']);
$row[] = $url['hits'];
$rows[$url['id']] = $row;
$default[$url['id']] = $url['enabled'];
}
Expand Down