From 34b60228cea44e57f884fd7d776b3d14a0f3545f Mon Sep 17 00:00:00 2001
From: farkasalexa <alexa@boly.hu>
Date: Thu, 3 May 2012 18:39:17 +0300
Subject: [PATCH 1/5] =?UTF-8?q?a=20userek=20nev=C3=A9t=20=C3=ADrja=20ki..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shrtr.module | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/shrtr.module b/shrtr.module
index d6f4496..eb9a6a0 100644
--- a/shrtr.module
+++ b/shrtr.module
@@ -196,17 +196,22 @@ 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[]= 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(
@@ -214,7 +219,7 @@ function shrtr_list_page() {
     '#header' => $header,
     '#rows' => $rows,
   );
-
+ 
   return $content;
 }
 
@@ -234,7 +239,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']);

From d3c146a0e1a106c6031f03adeef59534d385cfd0 Mon Sep 17 00:00:00 2001
From: farkasalexa <alexa@boly.hu>
Date: Thu, 3 May 2012 18:42:22 +0300
Subject: [PATCH 2/5] Update shrtr.module

---
 shrtr.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shrtr.module b/shrtr.module
index eb9a6a0..b06eb7d 100644
--- a/shrtr.module
+++ b/shrtr.module
@@ -201,12 +201,12 @@ function shrtr_list_page() {
      $new_url = $base_url . '/shrtr/' . $url['alias']; 
      $row = array();
      $row[] = $url['id'];
-     if($url['uid'] == 0){
+     if($url['uid'] == 0) {
       $row[]= t('Anonymus');
      }
      else{
        $row[] = user_load($url['uid'])->name;
-    }
+     }
      $row[] = $url['url'];
      $row[] = l($new_url, $new_url);
      $row[] = format_date($url['created']);

From d9853f34e655fef94568e1f8c193538380148118 Mon Sep 17 00:00:00 2001
From: farkasalexa <alexa@boly.hu>
Date: Thu, 3 May 2012 18:56:20 +0300
Subject: [PATCH 3/5] Update shrtr.module

---
 shrtr.module | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shrtr.module b/shrtr.module
index b06eb7d..d57604c 100644
--- a/shrtr.module
+++ b/shrtr.module
@@ -198,11 +198,12 @@ function shrtr_list_page() {
   $rows = array();
  
    while ($url = $urls->fetchAssoc()) {
+    dpm(user_load($url['uid']));
      $new_url = $base_url . '/shrtr/' . $url['alias']; 
      $row = array();
      $row[] = $url['id'];
      if($url['uid'] == 0) {
-      $row[]= t('Anonymus');
+      $row[] = variable_get('anonymus', t('Anonymus'));
      }
      else{
        $row[] = user_load($url['uid'])->name;

From 590a883084cf29a5936b9dd94aa2de0231f932ec Mon Sep 17 00:00:00 2001
From: farkasalexa <alexa@boly.hu>
Date: Thu, 3 May 2012 19:00:36 +0300
Subject: [PATCH 4/5] Update shrtr.module

---
 shrtr.module | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shrtr.module b/shrtr.module
index d57604c..2b830e6 100644
--- a/shrtr.module
+++ b/shrtr.module
@@ -203,7 +203,7 @@ function shrtr_list_page() {
      $row = array();
      $row[] = $url['id'];
      if($url['uid'] == 0) {
-      $row[] = variable_get('anonymus', t('Anonymus'));
+       $row[] = variable_get('anonymous', t('Anonymus'));
      }
      else{
        $row[] = user_load($url['uid'])->name;
@@ -220,7 +220,6 @@ function shrtr_list_page() {
     '#header' => $header,
     '#rows' => $rows,
   );
- 
   return $content;
 }
 

From e6ad50d466a84caab3057540404757c5dbd02d3c Mon Sep 17 00:00:00 2001
From: farkasalexa <alexa@boly.hu>
Date: Thu, 3 May 2012 19:03:57 +0300
Subject: [PATCH 5/5] =?UTF-8?q?Username=20v=C3=A1ltoztatva?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shrtr.module | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shrtr.module b/shrtr.module
index 2b830e6..fa7874d 100644
--- a/shrtr.module
+++ b/shrtr.module
@@ -198,7 +198,6 @@ function shrtr_list_page() {
   $rows = array();
  
    while ($url = $urls->fetchAssoc()) {
-    dpm(user_load($url['uid']));
      $new_url = $base_url . '/shrtr/' . $url['alias']; 
      $row = array();
      $row[] = $url['id'];