diff -up sites/kutaz.org/modules/nodeauthor/nodeauthor.css sites/kutaz.org/modules/nodeauthor6/nodeauthor.css
--- sites/kutaz.org/modules/nodeauthor/nodeauthor.css	2007-11-28 00:54:02.020254133 +0100
+++ sites/kutaz.org/modules/nodeauthor6/nodeauthor.css	2007-11-30 00:40:58.519481754 +0100
@@ -1,16 +1,17 @@
 .nodeauthor-info {
 	position: relative;
 	border: 1px solid black;
-	padding: 15px;
+	padding: 5px 10px 0px 10px;
 }
 .nodeauthor-info span { 
 	display: block;
 	position: absolute;
 	top: -15px;
+	left: 5px;
 	background: white;
 	padding: 5px;
 	font-weight: bold;
-	font-size: 110%;
+	font-size: 100%;
 }
 .nodeauthor-pic {
   float: left;
diff -up sites/kutaz.org/modules/nodeauthor/nodeauthor.info sites/kutaz.org/modules/nodeauthor6/nodeauthor.info
--- sites/kutaz.org/modules/nodeauthor/nodeauthor.info	2007-11-28 00:54:02.049244337 +0100
+++ sites/kutaz.org/modules/nodeauthor6/nodeauthor.info	2007-11-30 00:40:58.751408970 +0100
@@ -1,14 +1,6 @@
 ; $Id
 name = nodeauthor
 description = A simple module that adds an 'About Author' field to the bottom of selected node types which can be populated by users when they edit their profile.
-
-; Information added by drupal.org packaging script on 2007-01-14
-version = "5.x-1.2"
+core = 6.x
+version = "6.x-1.x-dev"
 project = "nodeauthor"
-
-
-; Information added by drupal.org packaging script on 2007-06-11
-version = "5.x-1.3"
-project = "nodeauthor"
-datestamp = "1181582406"
-
diff -up sites/kutaz.org/modules/nodeauthor/nodeauthor.module sites/kutaz.org/modules/nodeauthor6/nodeauthor.module
--- sites/kutaz.org/modules/nodeauthor/nodeauthor.module	2007-11-28 00:54:02.058241422 +0100
+++ sites/kutaz.org/modules/nodeauthor6/nodeauthor.module	2007-11-30 00:40:59.035318627 +0100
@@ -10,6 +10,17 @@
  */
 
 /**
+ * Implementation of hook_theme().
+ */
+function nodeauthor_theme() {
+  return array(
+    'authorinfo' => array(
+      'arguments' => array('info' => NULL, 'picture' => NULL),
+    ),
+  );
+}
+ 
+/**
  * Implementation of hook_help().
  */
 function nodeauthor_help($section) {
@@ -27,42 +38,40 @@ function nodeauthor_perm() {
  * Implementation of hook_user().
  */
 function nodeauthor_user($op, &$edit, &$account, $category = NULL) {
-
-  global $user;
-
-  if (user_access("edit own info")) {
+  if (user_access('edit own info', $account)) {
     if (($op == 'form') || ($op == 'register')) {
-      $form['userinfo'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Additional user info'),
-          '#collapsible' => TRUE,
-          '#collapsed' => TRUE,
-          '#weight' => 4);
-      $form['userinfo']['info'] = array(
-          '#type' => 'textarea',
-          '#title' => t('Short info'),
-          '#default_value' => $account->info,
-          '#description' => t('This info will be displayed in your content as "author information".'));
-      $form['userinfo']['format'] = filter_form($user->format);
-      return $form;
+		$form['userinfo'] = array(
+	      '#type' => 'fieldset',
+	      '#title' => t('Additional user info'),
+	      '#collapsible' => TRUE,
+	      '#collapsed' => TRUE,
+	      '#weight' => 4,
+		);
+		$form['userinfo']['info'] = array(
+	      '#type' => 'textarea',
+	      '#title' => t('Short info'),
+	      '#default_value' => $account->info,
+	      '#description' => t('This info will be displayed in your content as "author information".')
+		);
+		$form['userinfo']['format'] = filter_form($account->format);
     }
   }
+  return $form;
 }
+
 /**
  * Implementation of hook_menu()
  */
-function nodeauthor_menu($maycache) {
+function nodeauthor_menu() {
   $items = array();
 
-  $items[] = array(
-      'path' => 'admin/content/nodeauthor',
-      'title' => t('Nodeauthor'),
-      'description' => t('Modify which node types displays nodeauthor information'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'nodeauthor_admin_settings',
-      'access' => user_access('administer site configuration'),
-      'type' => MENU_NORMAL_ITEM, // optional
-      );
+  $items['admin/content/nodeauthor'] = array(
+    'title' => t('Nodeauthor'),
+    'description' => 'Modify which node types displays nodeauthor information',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('nodeauthor_admin_settings'),
+    'access arguments' => array('administer site configuration'),
+    );
   return $items;
 }
 
@@ -110,9 +119,9 @@ function nodeauthor_nodeapi(&$node, $op,
   switch ($op) {
     case 'alter':
       if (user_access("view author info")) {
-        $allowed = variable_get ('nodes_add_info', array());    
+        $allowed = variable_get('nodes_add_info', array());    
         if ($allowed[$node->type]) {
-          $user = user_load (array ('uid' => $node->uid));
+          $user = user_load(array('uid' => $node->uid));
           if (!empty($user->info)) {
             // Display picture if enabled
             if (variable_get('showpicture', 0) && !empty($user->picture)) {
@@ -121,9 +130,9 @@ function nodeauthor_nodeapi(&$node, $op,
               $picture = NULL;
             }
             $path = drupal_get_path('module', 'nodeauthor');
-            drupal_add_css(drupal_get_path('module', 'nodeauthor') .'/nodeauthor.css');
-
-            $node->body .= theme('authorinfo', check_markup($user->info, $user->format), $picture);
+            drupal_add_css($path . '/nodeauthor.css');
+			$info = check_markup($user->info, $user->format);
+            $node->body .= theme('authorinfo', $info, $picture);
           }
         }
       }
@@ -136,15 +145,14 @@ function nodeauthor_nodeapi(&$node, $op,
  *
  * @ingroup themeable
  */
-function theme_authorinfo($info, $picture = NULL) {
-  $ret = "<div class=\"nodeauthor-info\"><span>".t("About author")."</span>\n";
+function theme_authorinfo($info, $picture) {
+  $output = "<div class=\"nodeauthor-info\"><span>" . t("About the author") . "</span>";
   if (isset($picture)) {
-    $ret .= "<div class=\"nodeauthor-pic\"><img src=\"/".check_plain($picture)."\" alt=\"".t("User picture")."\" /></div>\n";
+    $output .= "<div class=\"nodeauthor-pic\"><img src=\"/" . check_plain($picture)."\" alt=\"".t("User picture")."\" /></div>";
   }
-  $ret .= "$info\n";
-  $ret .= "</div>\n";
-  return $ret;
+  $output .= $info;
+  $ret .= '</div>';
+  return $output;
 }
 
-
 ?>
