[xoops-svn] SF.net SVN: xoops-svn:[12277] XoopsModules/pedigree

[<be...@us...>]

Revision: 12277
          http://sourceforge.net/p/xoops/svn/12277
Author:   beckmi
Date:     2014-01-26 01:21:57 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
Work in progress - toward 1.31 Alpha 3

Modified Paths:
--------------
    XoopsModules/pedigree/trunk/pedigree/add_breeder.php
    XoopsModules/pedigree/trunk/pedigree/add_dog.php
    XoopsModules/pedigree/trunk/pedigree/add_litter.php
    XoopsModules/pedigree/trunk/pedigree/admin/about.php
    XoopsModules/pedigree/trunk/pedigree/admin/admin_footer.php
    XoopsModules/pedigree/trunk/pedigree/admin/admin_header.php
    XoopsModules/pedigree/trunk/pedigree/admin/colors.php
    XoopsModules/pedigree/trunk/pedigree/admin/config.php
    XoopsModules/pedigree/trunk/pedigree/admin/index.php
    XoopsModules/pedigree/trunk/pedigree/admin/main.php
    XoopsModules/pedigree/trunk/pedigree/admin/menu.php
    XoopsModules/pedigree/trunk/pedigree/admin/permissions.php
    XoopsModules/pedigree/trunk/pedigree/admin/savecolors.php
    XoopsModules/pedigree/trunk/pedigree/admin/tools.php
    XoopsModules/pedigree/trunk/pedigree/advanced.php
    XoopsModules/pedigree/trunk/pedigree/blocks/menu_block.php
    XoopsModules/pedigree/trunk/pedigree/book.php
    XoopsModules/pedigree/trunk/pedigree/breeder.php
    XoopsModules/pedigree/trunk/pedigree/class/fields.php
    XoopsModules/pedigree/trunk/pedigree/class/owner.php
    XoopsModules/pedigree/trunk/pedigree/class/temp.php
    XoopsModules/pedigree/trunk/pedigree/class/trash.php
    XoopsModules/pedigree/trunk/pedigree/class/tree.php
    XoopsModules/pedigree/trunk/pedigree/coi.php
    XoopsModules/pedigree/trunk/pedigree/comment_delete.php
    XoopsModules/pedigree/trunk/pedigree/comment_edit.php
    XoopsModules/pedigree/trunk/pedigree/comment_new.php
    XoopsModules/pedigree/trunk/pedigree/comment_post.php
    XoopsModules/pedigree/trunk/pedigree/comment_reply.php
    XoopsModules/pedigree/trunk/pedigree/convert.php
    XoopsModules/pedigree/trunk/pedigree/delete.php
    XoopsModules/pedigree/trunk/pedigree/deletebreeder.php
    XoopsModules/pedigree/trunk/pedigree/deletebreederpage.php
    XoopsModules/pedigree/trunk/pedigree/deletepage.php
    XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt
    XoopsModules/pedigree/trunk/pedigree/dog.php
    XoopsModules/pedigree/trunk/pedigree/edit.php
    XoopsModules/pedigree/trunk/pedigree/extra/smartclone/plugins/pedigree.php
    XoopsModules/pedigree/trunk/pedigree/imagemanager.php
    XoopsModules/pedigree/trunk/pedigree/images/numbers.png
    XoopsModules/pedigree/trunk/pedigree/include/checkoutwizard.php
    XoopsModules/pedigree/trunk/pedigree/include/class_eq_pie.php
    XoopsModules/pedigree/trunk/pedigree/include/class_field.php
    XoopsModules/pedigree/trunk/pedigree/include/color.php
    XoopsModules/pedigree/trunk/pedigree/include/config.php
    XoopsModules/pedigree/trunk/pedigree/include/css.php
    XoopsModules/pedigree/trunk/pedigree/include/functions.php
    XoopsModules/pedigree/trunk/pedigree/include/install_function.php
    XoopsModules/pedigree/trunk/pedigree/include/notification.inc.php
    XoopsModules/pedigree/trunk/pedigree/include/search.inc.php
    XoopsModules/pedigree/trunk/pedigree/include/update_function.php
    XoopsModules/pedigree/trunk/pedigree/include/waiting.plugin.php
    XoopsModules/pedigree/trunk/pedigree/include/wizard.php
    XoopsModules/pedigree/trunk/pedigree/index.php
    XoopsModules/pedigree/trunk/pedigree/language/english/admin.php
    XoopsModules/pedigree/trunk/pedigree/language/english/main.php
    XoopsModules/pedigree/trunk/pedigree/language/english/modinfo.php
    XoopsModules/pedigree/trunk/pedigree/latest.php
    XoopsModules/pedigree/trunk/pedigree/members.php
    XoopsModules/pedigree/trunk/pedigree/menu_block.php
    XoopsModules/pedigree/trunk/pedigree/mpedigree.php
    XoopsModules/pedigree/trunk/pedigree/notification_update.php
    XoopsModules/pedigree/trunk/pedigree/owner.php
    XoopsModules/pedigree/trunk/pedigree/pedigree.php
    XoopsModules/pedigree/trunk/pedigree/pedigree2.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/index.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/source/index.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/fonts/readme.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/readme.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/index.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/phpThumb.config.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/phpThumb.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/phpthumb.class.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/phpthumb.filters.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/phpthumb.functions.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/phpthumb.ico.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/phpthumb.unsharp.php
    XoopsModules/pedigree/trunk/pedigree/print.php
    XoopsModules/pedigree/trunk/pedigree/result.php
    XoopsModules/pedigree/trunk/pedigree/seldog.php
    XoopsModules/pedigree/trunk/pedigree/sql/mysql.sql
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_dog.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_header.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_owner.html
    XoopsModules/pedigree/trunk/pedigree/tools.php
    XoopsModules/pedigree/trunk/pedigree/topstud.php
    XoopsModules/pedigree/trunk/pedigree/update.php
    XoopsModules/pedigree/trunk/pedigree/updateowner.php
    XoopsModules/pedigree/trunk/pedigree/updatepage.php
    XoopsModules/pedigree/trunk/pedigree/userqueries/animals with a picture.php
    XoopsModules/pedigree/trunk/pedigree/userqueries/remove escaped slash.php
    XoopsModules/pedigree/trunk/pedigree/virtual.php
    XoopsModules/pedigree/trunk/pedigree/welcome.php
    XoopsModules/pedigree/trunk/pedigree/xoops_version.php

Added Paths:
-----------
    XoopsModules/pedigree/Base
    XoopsModules/pedigree/trunk/pedigree/admin/owner.php
    XoopsModules/pedigree/trunk/pedigree/admin/pedigree.php
    XoopsModules/pedigree/trunk/pedigree/admin/pedigree_config.php
    XoopsModules/pedigree/trunk/pedigree/admin/pedigree_temp.php
    XoopsModules/pedigree/trunk/pedigree/admin/pedigree_trash.php
    XoopsModules/pedigree/trunk/pedigree/class/breadcrumb.php
    XoopsModules/pedigree/trunk/pedigree/class/pedigree.php
    XoopsModules/pedigree/trunk/pedigree/extra/smartclone/plugins/XOOPS2.5_mod_Pedigree_1.31_Alpha1_xoops.zip
    XoopsModules/pedigree/trunk/pedigree/footer.php
    XoopsModules/pedigree/trunk/pedigree/header.php
    XoopsModules/pedigree/trunk/pedigree/include/common.php
    XoopsModules/pedigree/trunk/pedigree/phpthumb/README.md
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/6/
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/6/67/
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/6/67/67c/
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/6/67/67c/67c4/
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/phpThumbCacheIMcommandlineBase.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/phpThumbCacheIMversion.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/cache/phpThumbCacheStats.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/composer.json
    XoopsModules/pedigree/trunk/pedigree/phpthumb/docs/
    XoopsModules/pedigree/trunk/pedigree/phpthumb/docs/phpthumb.changelog.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/docs/phpthumb.faq.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/docs/phpthumb.license.commercial.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/docs/phpthumb.license.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/docs/phpthumb.readme.txt
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/1024-none.tiff
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/alpha.png
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/animaple.gif
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/big.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/bunnies.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/computer.wmf
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/disk.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/frame1.png
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/frame2.png
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/lilies.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/loco.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/lrock011.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/mask04.png
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/mask05.png
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/mask06.png
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/monkey.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/phpThumb.com.pdf
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/pineapple.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/small.jpg
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/watermark.png
    XoopsModules/pedigree/trunk/pedigree/phpthumb/images/winnt.bmp
    XoopsModules/pedigree/trunk/pedigree/templates/js/
    XoopsModules/pedigree/trunk/pedigree/templates/js/jquery.magnific-popup.js
    XoopsModules/pedigree/trunk/pedigree/templates/js/jquery.magnific-popup.min.js
    XoopsModules/pedigree/trunk/pedigree/templates/js/magnific-popup.css
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_common_breadcrumb.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_common_letterschoice.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_footer.html

Removed Paths:
-------------
    XoopsModules/pedigree/trunk/pedigree/admin/eigenaar.php
    XoopsModules/pedigree/trunk/pedigree/admin/stamboom.php
    XoopsModules/pedigree/trunk/pedigree/admin/stamboom_config.php
    XoopsModules/pedigree/trunk/pedigree/admin/stamboom_temp.php
    XoopsModules/pedigree/trunk/pedigree/admin/stamboom_trash.php

Added: XoopsModules/pedigree/Base
===================================================================
--- XoopsModules/pedigree/Base	                        (rev 0)
+++ XoopsModules/pedigree/Base	2014-01-26 01:21:57 UTC (rev 12277)
@@ -0,0 +1,31 @@
+---------------------------------------
+1.31 Alpha 2  2013-05-10
+---------------------------------------
+
+
+---------------------------------------
+1.31 Alpha 1  2013-04-12
+---------------------------------------
+
+- renamed to Pedigree (Mamba)
+- fixed several PHP 5.4 related bugs (Mamba)
+- standardized names of language variables (Mamba)
+- added cloning with SmartClone (Mamba)
+- sub-menus names will come from language files (mamba)
+
+
+---------------------------------------
+1.30 Beta 1  2013-03-03
+---------------------------------------
+
+- Converted to XOOPS 2.5.5 Admin GUI (Mamba)
+- Added classes for tables
+- renamed tables to follow XOOPS new standard "mod_module_table"
+- updated for PHP 5.4
+- added menu items to main menu
+- fixed two wrong handlers (flipse/mamba)
+
+---------------------------------------
+1.29 Final  ??????
+---------------------------------------
+released by James Cotton
\ No newline at end of file

Modified: XoopsModules/pedigree/trunk/pedigree/add_breeder.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/add_breeder.php	2014-01-25 02:53:45 UTC (rev 12276)
+++ XoopsModules/pedigree/trunk/pedigree/add_breeder.php	2014-01-26 01:21:57 UTC (rev 12277)
@@ -1,87 +1,79 @@
-<?php
-// ------------------------------------------------------------------------- 
-
-require_once "../../mainfile.php";
-if ( file_exists(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/".$xoopsConfig['language']."/main.php") )
-    require_once XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/".$xoopsConfig['language']."/main.php";
-else 
-	include_once XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/english/main.php";
-// Include any common code for this module.
-require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/functions.php");
-
-$xoopsOption['template_main'] = "pedigree_adddog.html";
-
-include XOOPS_ROOT_PATH.'/header.php';
-$xoopsTpl->assign('page_title', "Pedigree database - Add owner/breeder");
-
-//check for access
-$xoopsModule =& XoopsModule::getByDirname("pedigree");
-if (empty($xoopsUser)) 
-{
-	redirect_header("index.php", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-	exit();
-}
-
-$f = isset($_GET['f']) ? $_GET['f'] : '';
-if ($f == "check") { check(); }
-
-function check()
-{
-	global $xoopsTpl, $xoopsUser, $xoopsDB, $xoopsModuleConfig;
-	//check for access
-	$xoopsModule =& XoopsModule::getByDirname("pedigree");
-	if (empty($xoopsUser)) 
-	{
-		redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-		exit();
-	}
-	$achternaam = $_POST['achternaam'];
-	$voornaam = $_POST['voornaam'];
-	$email = $_POST['email'];
-	$website= $_POST['website'];
-	$user = $_POST['user'];
-	//insert into eigenaar
-		$query = "INSERT INTO ".$xoopsDB->prefix("mod_pedigree_owner")." VALUES ('','".$voornaam."','".$achternaam."','','','','','','".$email."','".$website."','".$user."')";
-		$xoopsDB->query($query);
-		redirect_header("index.php", 1, "The data has been stored.");
-}
-
-
-	global $xoopsTpl, $xoopsUser, $xoopsDB;
-	//check for access
-	$xoopsModule =& XoopsModule::getByDirname("pedigree");
-	if (empty($xoopsUser)) 
-	{
-		redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-		exit();
-	}
-	//create form
-	include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-	$form = new XoopsThemeForm(_MA_PEDIGREE_ADD_OWNER, 'breedername', 'add_breeder.php?f=check', 'POST');
-	$form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
-	$form->addElement(new XoopsFormHidden('user', $xoopsUser->getVar("uid")));
-	//lastname
-	$form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_LNAME."</b>", 'achternaam', $size=50, $maxsize=255, $value=''));
-	
-	//firstname
-	$form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_FNAME."</b>", 'voornaam', $size=50, $maxsize=255, $value=''));
-	
-	//email
-	$form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_EMAIL."</b>", 'email', $size=50, $maxsize=255, $value=''));
-	
-	//website
-	$form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_WEB."</b>", 'website', $size=50, $maxsize=255, $value=''));
-	$form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_OWN_WEB_EX));
-	
-	
-	//submit button
-	$form->addElement(new XoopsFormButton('', 'button_id', _MA_PEDIGREE_ADD_OWNER, 'submit'));
-	
-	//add data (form) to smarty template
-	$xoopsTpl->assign("form", $form->render());
-
-
-//footer
-include XOOPS_ROOT_PATH."/footer.php";
-
-?>
\ No newline at end of file
+<?php
+// -------------------------------------------------------------------------
+
+require_once '../../mainfile.php';
+if ( file_exists(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/".$xoopsConfig['language']."/main.php") )
+    require_once XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/".$xoopsConfig['language']."/main.php";
+else
+    include_once XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/english/main.php";
+// Include any common code for this module.
+require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/functions.php");
+
+$xoopsOption['template_main'] = "pedigree_adddog.html";
+
+include XOOPS_ROOT_PATH.'/header.php';
+$xoopsTpl->assign('page_title', "Pedigree database - Add owner/breeder");
+
+//check for access
+$xoopsModule =& XoopsModule::getByDirname("pedigree");
+if (empty($xoopsUser)) {
+    redirect_header("index.php", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+    exit();
+}
+
+$f = isset($_GET['f']) ? $_GET['f'] : '';
+if ($f == "check") { check(); }
+
+function check()
+{
+    global $xoopsTpl, $xoopsUser, $xoopsDB, $xoopsModuleConfig;
+    //check for access
+    $xoopsModule =& XoopsModule::getByDirname("pedigree");
+    if (empty($xoopsUser)) {
+        redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+        exit();
+    }
+    $achternaam = $_POST['achternaam'];
+    $voornaam = $_POST['voornaam'];
+    $email = $_POST['email'];
+    $website= $_POST['website'];
+    $user = $_POST['user'];
+    //insert into owner
+        $query = "INSERT INTO ".$xoopsDB->prefix("mod_pedigree_owner")." VALUES ('','".$voornaam."','".$achternaam."','','','','','','".$email."','".$website."','".$user."')";
+        $xoopsDB->query($query);
+        redirect_header("index.php", 1, "The data has been stored.");
+}
+
+    global $xoopsTpl, $xoopsUser, $xoopsDB;
+    //check for access
+    $xoopsModule =& XoopsModule::getByDirname("pedigree");
+    if (empty($xoopsUser)) {
+        redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+        exit();
+    }
+    //create form
+    include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+    $form = new XoopsThemeForm(_MA_PEDIGREE_ADD_OWNER, 'breedername', 'add_breeder.php?f=check', 'POST');
+    $form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
+    $form->addElement(new XoopsFormHidden('user', $xoopsUser->getVar("uid")));
+    //lastname
+    $form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_LNAME."</b>", 'achternaam', $size=50, $maxsize=255, $value=''));
+
+    //firstname
+    $form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_FNAME."</b>", 'voornaam', $size=50, $maxsize=255, $value=''));
+
+    //email
+    $form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_EMAIL."</b>", 'email', $size=50, $maxsize=255, $value=''));
+
+    //website
+    $form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_OWN_WEB."</b>", 'website', $size=50, $maxsize=255, $value=''));
+    $form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, _MA_PEDIGREE_FLD_OWN_WEB_EX));
+
+    //submit button
+    $form->addElement(new XoopsFormButton('', 'button_id', _MA_PEDIGREE_ADD_OWNER, 'submit'));
+
+    //add data (form) to smarty template
+    $xoopsTpl->assign("form", $form->render());
+
+//footer
+include XOOPS_ROOT_PATH."/footer.php";

Modified: XoopsModules/pedigree/trunk/pedigree/add_dog.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/add_dog.php	2014-01-25 02:53:45 UTC (rev 12276)
+++ XoopsModules/pedigree/trunk/pedigree/add_dog.php	2014-01-26 01:21:57 UTC (rev 12277)
@@ -1,11 +1,11 @@
 <?php
-// ------------------------------------------------------------------------- 
+// -------------------------------------------------------------------------
 
-require_once "../../mainfile.php";
+require_once '../../mainfile.php';
 if ( file_exists(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/".$xoopsConfig['language']."/main.php") )
     require_once XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/".$xoopsConfig['language']."/main.php";
-else 
-	include_once XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/english/main.php";
+else
+    include_once XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/language/english/main.php";
 // Include any common code for this module.
 require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
@@ -17,15 +17,13 @@
 
 //check for access
 $xoopsModule =& XoopsModule::getByDirname("pedigree");
-if (empty($xoopsUser)) 
-{
-	redirect_header("index.php", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-	exit();
+if (empty($xoopsUser)) {
+    redirect_header("index.php", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+    exit();
 }
 
 //create function variable from url
-if (isset($_GET['f'])) { $f = $_GET['f']; }
-else { $f = ""; adddog(); }
+if (isset($_GET['f'])) { $f = $_GET['f']; } else { $f = ""; adddog(); }
 if ($f == "checkname") { checkname(); }
 if ($f == "sire") { sire(); }
 if ($f == "dam") { dam(); }
@@ -33,358 +31,309 @@
 
 function adddog()
 {
-	global $xoopsTpl, $xoopsUser, $xoopsDB;
-	
-	//get module configuration
-	$module_handler =& xoops_gethandler('module');
-	$module         =& $module_handler->getByDirname("pedigree");
-	$config_handler =& xoops_gethandler('config');
-	$moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+    global $xoopsTpl, $xoopsUser, $xoopsDB;
 
-	//check for access	
-	if (empty($xoopsUser)) 
-	{
-		redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-		exit();
-	}
-	if ($xoopsUser->getVar("uid") == 0)
-	{
-		redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-		exit();
-	}
-	//create form
-	include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-	$form = new XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, array( '[animalType]' => $moduleConfig['animalType'] )), 'dogname', 'add_dog.php?f=checkname', 'POST');
-	$form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
-	//create random value
-	$random = (rand()%10000);
-	$form->addElement(new XoopsFormHidden('random', $random));
-	//find userid
-	$form->addElement(new XoopsFormHidden('user', $xoopsUser->getVar("uid")));
-	
-	//name
-	$form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_NAME."</b>", 'NAAM', $size=50, $maxsize=255, $value=''));
-	$string = strtr(_MA_PEDIGREE_FLD_NAME_EX, array( '[animalType]' => $moduleConfig['animalType'] ));
-	$form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, $string ));
-	
-		//submit button
-	$form->addElement(new XoopsFormButton('', 'button_id', strtr(_MA_PEDIGREE_ADD_DATA, array( '[animalType]' => $moduleConfig['animalType'] )), 'submit'));
-	
-	//add data (form) to smarty template
-	$xoopsTpl->assign("form", $form->render());
+    //get module configuration
+    $module_handler =& xoops_gethandler('module');
+    $module         =& $module_handler->getByDirname("pedigree");
+    $config_handler =& xoops_gethandler('config');
+    $moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+
+    //check for access
+    if (empty($xoopsUser)) {
+        redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+        exit();
+    }
+    if ($xoopsUser->getVar("uid") == 0) {
+        redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+        exit();
+    }
+    //create form
+    include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+    $form = new XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, array( '[animalType]' => $moduleConfig['animalType'] )), 'dogname', 'add_dog.php?f=checkname', 'POST');
+    $form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
+    //create random value
+    $random = (rand()%10000);
+    $form->addElement(new XoopsFormHidden('random', $random));
+    //find userid
+    $form->addElement(new XoopsFormHidden('user', $xoopsUser->getVar("uid")));
+
+    //name
+    $form->addElement(new XoopsFormText("<b>"._MA_PEDIGREE_FLD_NAME."</b>", 'NAAM', $size=50, $maxsize=255, $value=''));
+    $string = strtr(_MA_PEDIGREE_FLD_NAME_EX, array( '[animalType]' => $moduleConfig['animalType'] ));
+    $form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, $string ));
+
+        //submit button
+    $form->addElement(new XoopsFormButton('', 'button_id', strtr(_MA_PEDIGREE_ADD_DATA, array( '[animalType]' => $moduleConfig['animalType'] )), 'submit'));
+
+    //add data (form) to smarty template
+    $xoopsTpl->assign("form", $form->render());
 }
 
 function checkname()
 
 {
-	//configure global variables
-	global $xoopsTpl, $xoopsDB, $xoopsUser;
-	
-	
-	//get module configuration
-	$module_handler =& xoops_gethandler('module');
-	$module         =& $module_handler->getByDirname("pedigree");
-	$config_handler =& xoops_gethandler('config');
-	$moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
-	
-	
-	$name = $_POST['NAAM'];
-	//query
-	$queryString = "SELECT * from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE NAAM LIKE'%".$name."%' ORDER BY NAAM";
-	$result = $xoopsDB->query($queryString);
-	$numresults = $xoopsDB -> getRowsNum( $result );
-	if ($numresults >= 1 && !(isset($_GET['r'])))
-	{
-		//create form
-		include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-		$form = new XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, array( '[animalType]' => $moduleConfig['animalType'] )), 'dogname', 'add_dog.php?f=checkname&r=1', 'POST');
-		//other elements
-		$form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
-		$form->addElement(new XoopsFormHidden('NAAM', $_POST['NAAM']));
-		$form->addElement(new XoopsFormHidden('user', $xoopsUser->getVar("uid")));
-		while ($row = $xoopsDB->fetchArray($result)) 
-		{
-			//name
-			$form->addElement(new XoopsFormLabel("<b>"._MA_PEDIGREE_FLD_NAME."</b>", "<a href=\"dog.php?id=".$row['ID']."\">".stripslashes($row['NAAM'])."</a>"));
-		}
-		$form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_ADD_KNOWN, array( '[animalTypes]' => $moduleConfig['animalTypes'] ))));
-		//submit button
-		$form->addElement(new XoopsFormButton('', 'button_id', strtr(_MA_PEDIGREE_ADD_KNOWNOK, array( '[animalType]' => $moduleConfig['animalType'] )), 'submit'));
-		//add data (form) to smarty template
-		$xoopsTpl->assign("form", $form->render());
-	}
-	else
-	{
-		//create form
-		include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
-		$form = new XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, array( '[animalType]' => $moduleConfig['animalType'] )), 'dogname', 'add_dog.php?f=sire', 'POST');
-		//added to handle upload
-		$form->setExtra( "enctype='multipart/form-data'" );
-		$form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
-		//create random value
-		$random = (rand()%10000);
-		$form->addElement(new XoopsFormHidden('random', $random));
-		$form->addElement(new XoopsFormHidden('NAAM', htmlspecialchars($_POST['NAAM'], ENT_QUOTES)));
-		//find userid from previous form
-		$form->addElement(new XoopsFormHidden('user', $_POST['user']));
-		
-		//name
-		$form->addElement(new XoopsFormLabel("<b>"._MA_PEDIGREE_FLD_NAME."</b>", stripslashes($_POST['NAAM'])));
-		//gender
-		$gender_radio = new XoopsFormRadio( "<b>"._MA_PEDIGREE_FLD_GEND."</b>", 'roft', $value = '0' );
-		$gender_radio -> addOptionArray( array( '0'=>strtr(_MA_PEDIGREE_FLD_MALE, array( '[male]' => $moduleConfig['male'] )), '1'=>strtr(_MA_PEDIGREE_FLD_FEMA, array( '[female]' => $moduleConfig['female'] ))));
-		$form->addElement( $gender_radio );
-		if ($moduleConfig['ownerbreeder'] == '1')
-		{
-			//breeder
-			$breeder_select = new XoopsFormSelect("<b>"._MA_PEDIGREE_FLD_BREE."</b>", $name="id_fokker", $value='0', $size=1, $multiple=false);
-			$queryfok = "SELECT ID, lastname, firstname from ".$xoopsDB->prefix("mod_pedigree_owner")." ORDER BY lastname";
-			$resfok = $xoopsDB->query($queryfok);
-			$breeder_select -> addOption( '0', $name =_MA_PEDIGREE_UNKNOWN, $disabled=false );
-			while ($rowfok = $xoopsDB->fetchArray($resfok))
-			{
-				$breeder_select -> addOption( $rowfok['ID'], $name=$rowfok['lastname'].", ".$rowfok['firstname'], $disabled=false );
-			}
-			$form->addElement ( $breeder_select);
-			$form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_FLD_BREE_EX, array( '[animalType]' => $moduleConfig['animalType'] ))));
-			
-			//owner
-			$owner_select = new XoopsFormSelect("<b>"._MA_PEDIGREE_FLD_OWNE."</b>", $name="id_eigenaar", $value='0', $size=1, $multiple=false);
-			$queryfok = "SELECT ID, lastname, firstname from ".$xoopsDB->prefix("mod_pedigree_owner")." ORDER BY lastname";
-			$resfok = $xoopsDB->query($queryfok);
-			$owner_select -> addOption( '0', $name =_MA_PEDIGREE_UNKNOWN, $disabled=false );
-			while ($rowfok = $xoopsDB->fetchArray($resfok))
-			{
-				$owner_select -> addOption( $rowfok['ID'], $name=$rowfok['lastname'].", ".$rowfok['firstname'], $disabled=false );
-			}
-			$form->addElement ( $owner_select);
-			$form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_FLD_OWNE_EX, array( '[animalType]' => $moduleConfig['animalType'] ))));
-		}
-		//picture
-		$max_imgsize = 1024000;
-		$img_box = new XoopsFormFile("Image", "photo", $max_imgsize);
-		$img_box->setExtra( "size ='50'") ;
-		$form->addElement($img_box);
-		
-		//create animal object
-		$animal = new Animal( );
-		//test to find out how many user fields there are..
-		$fields = $animal->numoffields();
-		
-		for ($i = 0; $i < count($fields) ; $i++)
-		{
-			$userfield = new Field( $fields[$i], $animal->getconfig() );
-			$fieldType = $userfield->getSetting( "FieldType" );
-			$fieldobject = new $fieldType( $userfield, $animal );
-			if ($userfield->active() && !$userfield->isLocked())
-			{	
-				$newentry = $fieldobject->newField();
-				$form->addElement( $newentry );	
-			}
-			unset($newentry);
-		}
-		
-				
-		//submit button
-		$form->addElement(new XoopsFormButton('', 'button_id', strtr(_MA_PEDIGREE_ADD_SIRE, array( '[father]' => $moduleConfig['father'] )), 'submit'));
-		
-		//add data (form) to smarty template
-		$xoopsTpl->assign("form", $form->render());
-	}
+    //configure global variables
+    global $xoopsTpl, $xoopsDB, $xoopsUser;
+
+    //get module configuration
+    $module_handler =& xoops_gethandler('module');
+    $module         =& $module_handler->getByDirname("pedigree");
+    $config_handler =& xoops_gethandler('config');
+    $moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+
+    $name = $_POST['NAAM'];
+    //query
+    $queryString = "SELECT * from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE NAAM LIKE'%".$name."%' ORDER BY NAAM";
+    $result = $xoopsDB->query($queryString);
+    $numresults = $xoopsDB -> getRowsNum( $result );
+    if ($numresults >= 1 && !(isset($_GET['r']))) {
+        //create form
+        include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+        $form = new XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, array( '[animalType]' => $moduleConfig['animalType'] )), 'dogname', 'add_dog.php?f=checkname&r=1', 'POST');
+        //other elements
+        $form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
+        $form->addElement(new XoopsFormHidden('NAAM', $_POST['NAAM']));
+        $form->addElement(new XoopsFormHidden('user', $xoopsUser->getVar("uid")));
+        while ($row = $xoopsDB->fetchArray($result)) {
+            //name
+            $form->addElement(new XoopsFormLabel("<b>"._MA_PEDIGREE_FLD_NAME."</b>", "<a href=\"dog.php?id=".$row['ID']."\">".stripslashes($row['NAAM'])."</a>"));
+        }
+        $form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_ADD_KNOWN, array( '[animalTypes]' => $moduleConfig['animalTypes'] ))));
+        //submit button
+        $form->addElement(new XoopsFormButton('', 'button_id', strtr(_MA_PEDIGREE_ADD_KNOWNOK, array( '[animalType]' => $moduleConfig['animalType'] )), 'submit'));
+        //add data (form) to smarty template
+        $xoopsTpl->assign("form", $form->render());
+    } else {
+        //create form
+        include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+        $form = new XoopsThemeForm(strtr(_MA_PEDIGREE_ADD_DOG, array( '[animalType]' => $moduleConfig['animalType'] )), 'dogname', 'add_dog.php?f=sire', 'POST');
+        //added to handle upload
+        $form->setExtra( "enctype='multipart/form-data'" );
+        $form->addElement(new XoopsFormHiddenToken($name = 'XOOPS_TOKEN_REQUEST', $timeout = 360));
+        //create random value
+        $random = (rand()%10000);
+        $form->addElement(new XoopsFormHidden('random', $random));
+        $form->addElement(new XoopsFormHidden('NAAM', htmlspecialchars($_POST['NAAM'], ENT_QUOTES)));
+        //find userid from previous form
+        $form->addElement(new XoopsFormHidden('user', $_POST['user']));
+
+        //name
+        $form->addElement(new XoopsFormLabel("<b>"._MA_PEDIGREE_FLD_NAME."</b>", stripslashes($_POST['NAAM'])));
+        //gender
+        $gender_radio = new XoopsFormRadio( "<b>"._MA_PEDIGREE_FLD_GEND."</b>", 'roft', $value = '0' );
+        $gender_radio -> addOptionArray( array( '0'=>strtr(_MA_PEDIGREE_FLD_MALE, array( '[male]' => $moduleConfig['male'] )), '1'=>strtr(_MA_PEDIGREE_FLD_FEMA, array( '[female]' => $moduleConfig['female'] ))));
+        $form->addElement( $gender_radio );
+        if ($moduleConfig['ownerbreeder'] == '1') {
+            //breeder
+            $breeder_select = new XoopsFormSelect("<b>"._MA_PEDIGREE_FLD_BREE."</b>", $name="id_breeder", $value='0', $size=1, $multiple=false);
+            $queryfok = "SELECT ID, lastname, firstname from ".$xoopsDB->prefix("mod_pedigree_owner")." ORDER BY lastname";
+            $resfok = $xoopsDB->query($queryfok);
+            $breeder_select -> addOption( '0', $name =_MA_PEDIGREE_UNKNOWN, $disabled=false );
+            while ($rowfok = $xoopsDB->fetchArray($resfok)) {
+                $breeder_select -> addOption( $rowfok['ID'], $name=$rowfok['lastname'].", ".$rowfok['firstname'], $disabled=false );
+            }
+            $form->addElement ( $breeder_select);
+            $form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_FLD_BREE_EX, array( '[animalType]' => $moduleConfig['animalType'] ))));
+
+            //owner
+            $owner_select = new XoopsFormSelect("<b>"._MA_PEDIGREE_FLD_OWNE."</b>", $name="id_owner", $value='0', $size=1, $multiple=false);
+            $queryfok = "SELECT ID, lastname, firstname from ".$xoopsDB->prefix("mod_pedigree_owner")." ORDER BY lastname";
+            $resfok = $xoopsDB->query($queryfok);
+            $owner_select -> addOption( '0', $name =_MA_PEDIGREE_UNKNOWN, $disabled=false );
+            while ($rowfok = $xoopsDB->fetchArray($resfok)) {
+                $owner_select -> addOption( $rowfok['ID'], $name=$rowfok['lastname'].", ".$rowfok['firstname'], $disabled=false );
+            }
+            $form->addElement ( $owner_select);
+            $form->addElement(new XoopsFormLabel(_MA_PEDIGREE_EXPLAIN, strtr(_MA_PEDIGREE_FLD_OWNE_EX, array( '[animalType]' => $moduleConfig['animalType'] ))));
+        }
+        //picture
+        $max_imgsize = 1024000;
+        $img_box = new XoopsFormFile("Image", "photo", $max_imgsize);
+        $img_box->setExtra( "size ='50'") ;
+        $form->addElement($img_box);
+
+        //create animal object
+        $animal = new Animal( );
+        //test to find out how many user fields there are..
+        $fields = $animal->numoffields();
+
+        for ($i = 0; $i < count($fields) ; $i++) {
+            $userfield = new Field( $fields[$i], $animal->getconfig() );
+            $fieldType = $userfield->getSetting( "FieldType" );
+            $fieldobject = new $fieldType( $userfield, $animal );
+            if ($userfield->active() && !$userfield->isLocked()) {
+                $newentry = $fieldobject->newField();
+                $form->addElement( $newentry );
+            }
+            unset($newentry);
+        }
+
+        //submit button
+        $form->addElement(new XoopsFormButton('', 'button_id', strtr(_MA_PEDIGREE_ADD_SIRE, array( '[father]' => $moduleConfig['father'] )), 'submit'));
+
+        //add data (form) to smarty template
+        $xoopsTpl->assign("form", $form->render());
+    }
 }
 
 function sire()
 {
-	global $xoopsTpl, $xoopsUser, $xoopsDB;
-	
-	//get module configuration
-	$module_handler =& xoops_gethandler('module');
-	$module         =& $module_handler->getByDirname("pedigree");
-	$config_handler =& xoops_gethandler('config');
-	$moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+    global $xoopsTpl, $xoopsUser, $xoopsDB;
+
+    //get module configuration
+    $module_handler =& xoops_gethandler('module');
+    $module         =& $module_handler->getByDirname("pedigree");
+    $config_handler =& xoops_gethandler('config');
+    $moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
     $empty = array () ; // an empty array
 
-	//check for access
-	if (empty($xoopsUser)) 
-	{
-		redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-		exit();
-	}
-	$user = isset($_POST['user']) ? $_POST['user'] : null;
-	if (empty($random)) { $random = isset($_POST['random']) ? $_POST['random'] : null; }
-	if (isset($_GET['random'])) { $random = $_GET['random']; }
-	if (empty($st)) { $st=0; }
-	if (isset($_GET['st'])) { $st=$_GET['st']; }
-	$name = isset($_POST['NAAM']) ? $_POST['NAAM'] : null;
-	$roft = isset($_POST['roft']) ? $_POST['roft'] : null;
+    //check for access
+    if (empty($xoopsUser)) {
+        redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+        exit();
+    }
+    $user = isset($_POST['user']) ? $_POST['user'] : null;
+    if (empty($random)) { $random = isset($_POST['random']) ? $_POST['random'] : null; }
+    if (isset($_GET['random'])) { $random = $_GET['random']; }
+    if (empty($st)) { $st=0; }
+    if (isset($_GET['st'])) { $st=$_GET['st']; }
+    $name = isset($_POST['NAAM']) ? $_POST['NAAM'] : null;
+    $roft = isset($_POST['roft']) ? $_POST['roft'] : null;
 
-	$id_eigenaar = isset($_POST['id_eigenaar']) ? $_POST['id_eigenaar'] : null;
-	$id_fokker = isset($_POST['id_fokker']) ? $_POST['id_fokker'] : null;
+    $id_owner = isset($_POST['id_owner']) ? $_POST['id_owner'] : null;
+    $id_breeder = isset($_POST['id_breeder']) ? $_POST['id_breeder'] : null;
 
-	$picturefield = isset($_FILES['photo']) ? $_FILES['photo']['name'] : null;  // $_FILES['photo']['name'];
-	if( empty( $picturefield ) || $picturefield == "" ) 
-	{
-		$foto = "";
-	}
-	else
-	{
-		$foto = uploadedpict( 0 );
-	}
-	$numpicturefield = 1;	
-	
-	//make the redirect
-	if (!isset($_GET['r']))
-	{
-		if ($_POST['NAAM'] == "")
-		{
-			redirect_header("add_dog.php", 1, _MA_PEDIGREE_ADD_NAMEPLZ);
-		}
-		//create animal object
-		$animal = new Animal( );
-		//test to find out how many user fields there are..
-		$fields = $animal->numoffields();
-		sort($fields); //sort by ID not by order
-		$usersql = "";
-		for ($i = 0; $i < count($fields); $i++)
-		{
-			$userfield = new Field( $fields[$i], $animal->getconfig() );
-			$fieldType = $userfield->getSetting( "FieldType" );
-			$fieldobject = new $fieldType( $userfield, $animal );
-			if ($userfield->active())
-			{	
-				//check if _FILES variable exists for user picturefield
-				$currentfield = 'user'.$fields[$i];
-				$picturefield = $_FILES[$currentfield]['name'];
-				if($fieldType == "Picture" && ( !empty( $picturefield ) || $picturefield != "" ))
-				{
-					$userpicture = uploadedpict( $numpicturefield );
-					$usersql .= ",'".$userpicture."'";
-					$numpicturefield ++;
-				}
-				elseif($userfield->isLocked())
-				{
-					//userfield is locked, substitute default value
-					$usersql .= ",'".$userfield->DefaultValue."'";
-				}
-				else
-				{
-					//echo $fieldType.":".$i.":".$fields[$i]."<br />";
-					$usersql .= ",'".unhtmlentities($_POST['user'.$fields[$i]])."'";
-				}	
-			}
-			else
-			{
-				$usersql .=",''";	
-			}
-			//echo $fields[$i]."<br/>";
-			
-		}
-		
-		//insert into stamboom_temp
-		$query = "INSERT INTO ".$xoopsDB->prefix("mod_pedigree_temp")." VALUES ('".$random."','".unhtmlentities($name)."','".$id_eigenaar."','".$id_fokker."','".$user."','".$roft."','','','".$foto."', ''".$usersql.")";
-		//echo $query; die();
-		$xoopsDB->query($query);
-		redirect_header("add_dog.php?f=sire&random=".$random."&st=".$st."&r=1&l=a", 1, strtr(_MA_PEDIGREE_ADD_SIREPLZ, array( '[father]' => $moduleConfig['father'] )));
-	}	
-	//find letter on which to start else set to 'a'
-	if (isset($_GET['l'])) { $l=$_GET['l']; }
-	else { $l="a"; }
-	//assign sire to template
-	$xoopsTpl->assign("sire", "1");
-	//create list of males dog to select from
-	$perp = $moduleConfig['perpage'];
-	//count total number of dogs
-	$numdog = "SELECT count(ID) from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE roft='0' and NAAM LIKE '".$l."%'";
-	$numres = $xoopsDB->query($numdog);
-	//total number of dogs the query will find
-	list($numresults) = $xoopsDB->fetchRow($numres);
-	//total number of pages
-	$numpages = (floor($numresults/$perp))+1;
-	if (($numpages * $perp) == ($numresults + $perp))
-		{	$numpages = $numpages - 1; }
-	//find current page
-	$cpage = (floor($st/$perp))+1;
-	//create alphabet
-	$pages ="";
-	for($i=65; $i<=90; $i++) 
-	{
-		if ($l == chr($i))
-		{
-			$pages .= "<b><a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a></b>&nbsp;";
-		}
-		else
-		{
-			$pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a>&nbsp;";
-		}
-	}
-	$pages .="-&nbsp;";
-	$pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=Å\">Å</a>&nbsp;";
-	$pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=Ö\">Ö</a>&nbsp;";
-	//create linebreak
-	$pages .= "<br />";
-	//create previous button
-	if ($numpages > 1)
-	{
-		if ($cpage > 1)	
-		{
-			$pages .= "<a href=\"add_dog.php?f=sire&r=1&l=".$l."&random=".$random."&st=".($st-$perp)."\">"._MA_PEDIGREE_PREVIOUS."</a>&nbsp;&nbsp";
-		}
-	}
-	//create numbers
-	for ($x=1; $x<($numpages+1); $x++)
-	{	
-		//create line break after 20 number
-		if (($x % 20) == 0)
-		{ $pages .= "<br />"; }
-		if ($x != $cpage)
-		{ $pages .= "<a href=\"add_dog.php?f=sire&r=1&l=".$l."&random=".$random."&st=".($perp*($x-1))."\">".$x."</a>&nbsp;&nbsp;"; }
-		else
-		{ $pages .= $x."&nbsp;&nbsp";  }
-	}
-	//create next button
-	if ($numpages > 1)
-	{
-		if ($cpage < ($numpages))	
-		{
-			$pages .= "<a href=\"add_dog.php?f=sire&r=1&l=".$l."&random=".$random."&st=".($st+$perp)."\">"._MA_PEDIGREE_NEXT."</a>&nbsp;&nbsp";
-		}
-	}
-	
-	//query
-	$queryString = "SELECT * from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE roft = '0' and NAAM like '".$l."%'ORDER BY NAAM LIMIT ".$st.", ".$perp;
-	$result = $xoopsDB->query($queryString);
-	
-	
+    $picturefield = isset($_FILES['photo']) ? $_FILES['photo']['name'] : null;  // $_FILES['photo']['name'];
+    if ( empty( $picturefield ) || $picturefield == "" ) {
+        $foto = "";
+    } else {
+        $foto = uploadedpict( 0 );
+    }
+    $numpicturefield = 1;
+
+    //make the redirect
+    if (!isset($_GET['r'])) {
+        if ($_POST['NAAM'] == "") {
+            redirect_header("add_dog.php", 1, _MA_PEDIGREE_ADD_NAMEPLZ);
+        }
+        //create animal object
+        $animal = new Animal( );
+        //test to find out how many user fields there are..
+        $fields = $animal->numoffields();
+        sort($fields); //sort by ID not by order
+        $usersql = "";
+        for ($i = 0; $i < count($fields); $i++) {
+            $userfield = new Field( $fields[$i], $animal->getconfig() );
+            $fieldType = $userfield->getSetting( "FieldType" );
+            $fieldobject = new $fieldType( $userfield, $animal );
+            if ($userfield->active()) {
+                //check if _FILES variable exists for user picturefield
+                $currentfield = 'user'.$fields[$i];
+                $picturefield = $_FILES[$currentfield]['name'];
+                if ($fieldType == "Picture" && ( !empty( $picturefield ) || $picturefield != "" )) {
+                    $userpicture = uploadedpict( $numpicturefield );
+                    $usersql .= ",'".$userpicture."'";
+                    $numpicturefield ++;
+                } elseif ($userfield->isLocked()) {
+                    //userfield is locked, substitute default value
+                    $usersql .= ",'".$userfield->DefaultValue."'";
+                } else {
+                    //echo $fieldType.":".$i.":".$fields[$i]."<br />";
+                    $usersql .= ",'".unhtmlentities($_POST['user'.$fields[$i]])."'";
+                }
+            } else {
+                $usersql .=",''";
+            }
+            //echo $fields[$i]."<br/>";
+
+        }
+
+        //insert into pedigree_temp
+        $query = "INSERT INTO ".$xoopsDB->prefix("mod_pedigree_temp")." VALUES ('".$random."','".unhtmlentities($name)."','".$id_owner."','".$id_breeder."','".$user."','".$roft."','','','".$foto."', ''".$usersql.")";
+        //echo $query; die();
+        $xoopsDB->query($query);
+        redirect_header("add_dog.php?f=sire&random=".$random."&st=".$st."&r=1&l=a", 1, strtr(_MA_PEDIGREE_ADD_SIREPLZ, array( '[father]' => $moduleConfig['father'] )));
+    }
+    //find letter on which to start else set to 'a'
+    if (isset($_GET['l'])) { $l=$_GET['l']; } else { $l="a"; }
+    //assign sire to template
+    $xoopsTpl->assign("sire", "1");
+    //create list of males dog to select from
+    $perp = $moduleConfig['perpage'];
+    //count total number of dogs
+    $numdog = "SELECT count(ID) from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE roft='0' and NAAM LIKE '".$l."%'";
+    $numres = $xoopsDB->query($numdog);
+    //total number of dogs the query will find
+    list($numresults) = $xoopsDB->fetchRow($numres);
+    //total number of pages
+    $numpages = (floor($numresults/$perp))+1;
+    if (($numpages * $perp) == ($numresults + $perp)) {	$numpages = $numpages - 1; }
+    //find current page
+    $cpage = (floor($st/$perp))+1;
+    //create alphabet
+    $pages ="";
+    for ($i=65; $i<=90; $i++) {
+        if ($l == chr($i)) {
+            $pages .= "<b><a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a></b>&nbsp;";
+        } else {
+            $pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a>&nbsp;";
+        }
+    }
+    $pages .="-&nbsp;";
+    $pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=Å\">Å</a>&nbsp;";
+    $pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=Ö\">Ö</a>&nbsp;";
+    //create linebreak
+    $pages .= "<br />";
+    //create previous button
+    if ($numpages > 1) {
+        if ($cpage > 1) {
+            $pages .= "<a href=\"add_dog.php?f=sire&r=1&l=".$l."&random=".$random."&st=".($st-$perp)."\">"._MA_PEDIGREE_PREVIOUS."</a>&nbsp;&nbsp";
+        }
+    }
+    //create numbers
+    for ($x=1; $x<($numpages+1); $x++) {
+        //create line break after 20 number
+        if (($x % 20) == 0) { $pages .= "<br />"; }
+        if ($x != $cpage) { $pages .= "<a href=\"add_dog.php?f=sire&r=1&l=".$l."&random=".$random."&st=".($perp*($x-1))."\">".$x."</a>&nbsp;&nbsp;"; } else { $pages .= $x."&nbsp;&nbsp";  }
+    }
+    //create next button
+    if ($numpages > 1) {
+        if ($cpage < ($numpages)) {
+            $pages .= "<a href=\"add_dog.php?f=sire&r=1&l=".$l."&random=".$random."&st=".($st+$perp)."\">"._MA_PEDIGREE_NEXT."</a>&nbsp;&nbsp";
+        }
+    }
+
+    //query
+    $queryString = "SELECT * from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE roft = '0' and NAAM like '".$l."%'ORDER BY NAAM LIMIT ".$st.", ".$perp;
+    $result = $xoopsDB->query($queryString);
+
 $animal = new Animal( );
 //test to find out how many user fields there are...
 $fields = $animal->numoffields();
 $numofcolumns = 1;
 $columns[] = array ('columnname' => "Name");
-for ($i = 0; $i < count($fields); $i++)
-{
-	$userfield = new Field( $fields[$i], $animal->getconfig() );
-	$fieldType = $userfield->getSetting( "FieldType" );
-	$fieldobject = new $fieldType( $userfield, $animal );
-	//create empty string
-	$lookupvalues = "";
-	if ($userfield->active() && $userfield->inlist())
-	{
-		if ($userfield->haslookup())
-		{
-			$lookupvalues = $userfield->lookup($fields[$i]);
-			//debug information
-			//print_r($lookupvalues);	
-		}
-		$columns[] = array ('columnname' => $fieldobject->fieldname, 'columnnumber' => $userfield->getID(), 'lookupval' => $lookupvalues);
-		$numofcolumns++;
-		unset($lookupvalues);
-	}
+for ($i = 0; $i < count($fields); $i++) {
+    $userfield = new Field( $fields[$i], $animal->getconfig() );
+    $fieldType = $userfield->getSetting( "FieldType" );
+    $fieldobject = new $fieldType( $userfield, $animal );
+    //create empty string
+    $lookupvalues = "";
+    if ($userfield->active() && $userfield->inlist()) {
+        if ($userfield->haslookup()) {
+            $lookupvalues = $userfield->lookup($fields[$i]);
+            //debug information
+            //print_r($lookupvalues);
+        }
+        $columns[] = array ('columnname' => $fieldobject->fieldname, 'columnnumber' => $userfield->getID(), 'lookupval' => $lookupvalues);
+        $numofcolumns++;
+        unset($lookupvalues);
+    }
 }
-	
-	for ($i = 1; $i < ($numofcolumns); $i++)
-	{
-		$empty[] = array ('value' => "");		
-	}
+
+    for ($i = 1; $i < ($numofcolumns); $i++) {
+        $empty[] = array ('value' => "");
+    }
     $dogs [] = array('id'          => "0",
                      'name'        => "",
                      'gender'      => "",
@@ -393,281 +342,233 @@
                      'number'      => "",
                      'usercolumns' => $empty
     );
-	
-	
-	while ($row = $xoopsDB->fetchArray($result)) 
-	{
-		//create picture information
-		if ($row['foto'] != '')
-		{ $camera = " <img src=\"images/camera.png\">"; }
-		else { $camera = ""; }
-		$name = stripslashes($row['NAAM']).$camera;
-		//empty array
-		unset($columnvalue);	
-		//fill array
-		for ($i = 1; $i < ($numofcolumns); $i++)
-		{
-			$x = $columns[$i]['columnnumber'];
-			if (is_array($columns[$i]['lookupval']))
-			{
-				foreach ($columns[$i]['lookupval'] as $key => $keyvalue)
-				{
-					if($key == $row['user'.$x])
-					{
-						$value = $keyvalue['value'];
-					}	
-				}	
-				//debug information
-				///echo $columns[$i]['columnname']."is an array !";
-			}
-			//format value - cant use object because of query count
-			elseif (substr($row['user'.$x], 0, 7) == 'http://')
-			{
-				$value = "<a href=\"".$row['user'.$x]."\">".$row['user'.$x]."</a>";	
-			}
-			else { $value = $row['user'.$x]; }		
-			$columnvalue[] = array ('value' => $value);	
-		}
-		$dogs[] = array ('id' => $row['ID'], 'name' => $name, 'gender' => '<img src="images/male.gif">', 'link' => "<a href=\"add_dog.php?f=dam&random=".$random."&selsire=".$row['ID']."\">".$name."</a>",'colour' => "", 'number' => "", 'usercolumns' => $columnvalue);
-	}
-	
-	//add data to smarty template
-	//assign dog
-	$xoopsTpl->assign("dogs", $dogs);
-	$xoopsTpl->assign("columns", $columns);
-	$xoopsTpl->assign("numofcolumns", $numofcolumns);
-	$xoopsTpl->assign("tsarray", sorttable($numofcolumns));
-	//assign links
-	$xoopsTpl->assign("nummatch", strtr(_MA_PEDIGREE_ADD_SELSIRE, array( '[father]' => $moduleConfig['father'] )));
-	$xoopsTpl->assign("pages", $pages);
-	
-	
+
+    while ($row = $xoopsDB->fetchArray($result)) {
+        //create picture information
+        if ($row['foto'] != '') { $camera = " <img src=\"images/camera.png\">"; } else { $camera = ""; }
+        $name = stripslashes($row['NAAM']).$camera;
+        //empty array
+        unset($columnvalue);
+        //fill array
+        for ($i = 1; $i < ($numofcolumns); $i++) {
+            $x = $columns[$i]['columnnumber'];
+            if (is_array($columns[$i]['lookupval'])) {
+                foreach ($columns[$i]['lookupval'] as $key => $keyvalue) {
+                    if ($key == $row['user'.$x]) {
+                        $value = $keyvalue['value'];
+                    }
+                }
+                //debug information
+                ///echo $columns[$i]['columnname']."is an array !";
+            }
+            //format value - cant use object because of query count
+            elseif (substr($row['user'.$x], 0, 7) == 'http://') {
+                $value = "<a href=\"".$row['user'.$x]."\">".$row['user'.$x]."</a>";
+            } else { $value = $row['user'.$x]; }
+            $columnvalue[] = array ('value' => $value);
+        }
+        $dogs[] = array ('id' => $row['ID'], 'name' => $name, 'gender' => '<img src="images/male.gif">', 'link' => "<a href=\"add_dog.php?f=dam&random=".$random."&selsire=".$row['ID']."\">".$name."</a>",'colour' => "", 'number' => "", 'usercolumns' => $columnvalue);
+    }
+
+    //add data to smarty template
+    //assign dog
+    $xoopsTpl->assign("dogs", $dogs);
+    $xoopsTpl->assign("columns", $columns);
+    $xoopsTpl->assign("numofcolumns", $numofcolumns);
+    $xoopsTpl->assign("tsarray", sorttable($numofcolumns));
+    //assign links
+    $xoopsTpl->assign("nummatch", strtr(_MA_PEDIGREE_ADD_SELSIRE, array( '[father]' => $moduleConfig['father'] )));
+    $xoopsTpl->assign("pages", $pages);
+
 }
 
 function dam()
 {
-	global $xoopsTpl, $xoopsUser, $xoopsDB;
-	
-	//get module configuration
-	$module_handler =& xoops_gethandler('module');
-	$module         =& $module_handler->getByDirname("pedigree");
-	$config_handler =& xoops_gethandler('config');
-	$moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+    global $xoopsTpl, $xoopsUser, $xoopsDB;
+
+    //get module configuration
+    $module_handler =& xoops_gethandler('module');
+    $module         =& $module_handler->getByDirname("pedigree");
+    $config_handler =& xoops_gethandler('config');
+    $moduleConfig   =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
     $empty = array () ; // an empty array
 
-	//check for access
-	$xoopsModule =& XoopsModule::getByDirname("pedigree");
-	if (empty($xoopsUser))
-	{
-		redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
-		exit();
-	}
-	if (empty($random)) { $random = isset($_POST['random']) ? $_POST['random'] : null; }
-	if (isset($_GET['random'])) { $random = $_GET['random']; }
-	if (empty($st)) { $st=0; }
-	if (isset($_GET['st'])) { $st=$_GET['st']; }
-	//find letter on which to start else set to 'a'
-	if (isset($_GET['l'])) { $l=$_GET['l']; }
-	else { $l="a"; }
-	//make the redirect
-	if (!isset($_GET['r']))
-	{	
-		//insert into stamboom_temp
-		$query = "UPDATE ".$xoopsDB->prefix("mod_pedigree_temp")." SET vader =".$_GET['selsire']." WHERE ID=".$random;
-		$xoopsDB->queryf($query);
-		redirect_header("add_dog.php?f=dam&random=".$random."&st=".$st."&r=1&l=a", 1, strtr(_MA_PEDIGREE_ADD_SIREOK, array( '[mother]' => $moduleConfig['mother'] )));
-	}
-	
-	$xoopsTpl->assign("sire", "1");
-	//create list of males dog to select from
-	$perp = $moduleConfig['perpage'];
-	//count total number of dogs
-	$numdog = "SELECT count(ID) from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE roft='1' and NAAM LIKE '".$l."%'";
-	$numres = $xoopsDB->query($numdog);
-	list($numresults) = $xoopsDB->fetchRow($numres);
-	$numpages = (floor($numresults/$perp))+1;
-	if (($numpages * $perp) == ($numresults + $perp))
-		{	$numpages = $numpages - 1; }
-	$cpage = (floor($st/$perp))+1;
-	//create alphabet
-	$pages ="";
-	for($i=65; $i<=90; $i++) 
-	{
-		if ($l == chr($i))
-		{
-			$pages .= "<b><a href=\"add_dog.php?f=dam&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a></b>&nbsp;";
-		}
-		else
-		{
-			$pages .= "<a href=\"add_dog.php?f=dam&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a>&nbsp;";
-		}	
-	}
-	$pages .="-&nbsp;";
-	$pages .= "<a href=\"add_dog.php?f=dam&r=1&random=".$random."&l=Å\">Å</a>&nbsp;";
-	$pages .= "<a href=\"add_dog.php?f=dam&r=1&random=".$random."&l=Ö\">Ö</a>&nbsp;";
-	$pages .= "<br />";
-	//create previous button
-	if ($numpages > 1)
-	{
-		if ($cpage > 1)	{ $pages .= "<a href=\"add_dog.php?f=dam&r=1&l=".$l."&random=".$random."&st=".($st-$perp)."\">"._MA_PEDIGREE_PREVIOUS."</a>&nbsp;&nbsp"; }
-	}
-	//create numbers
-	for ($x=1; $x<($numpages+1); $x++)
-	{	
-		//create line break after 20 number
-		if (($x % 20) == 0)	{ $pages .= "<br />"; }
-		if ($x != $cpage)
-		{ $pages .= "<a href=\"add_dog.php?f=dam&r=1&l=".$l."&random=".$random."&st=".($perp*($x-1))."\">".$x."</a>&nbsp;&nbsp;"; }
-		else
-		{ $pages .= $x."&nbsp;&nbsp";  }
-	}
-	//create next button
-	if ($numpages > 1)
-	{
-		if ($cpage < ($numpages)) { $pages .= "<a href=\"add_dog.php?f=dam&l=".$l."&r=1&random=".$random."&st=".($st+$perp)."\">"._MA_PEDIGREE_NEXT."</a>&nbsp;&nbsp;"; }
-	}
-	
-	//query
-	$queryString = "SELECT * from ".$xoopsDB->prefix("mod_pedigree_tree")." WHERE roft = '1' and NAAM LIKE '".$l."%' ORDER BY NAAM LIMIT ".$st.", ".$perp;
-	$result = $xoopsDB->query($queryString);
-	
-	$animal = new Animal( );
-	//test to find out how many user fields there are...
-	$fields = $animal->numoffields();
-	$numofcolumns = 1;
-	$columns[] = array ('columnname' => "Name");
-	for ($i = 0; $i < count($fields); $i++)
-	{
-		$userfield = new Field( $fields[$i], $animal->getconfig() );
-		$fieldType = $userfield->getSetting( "FieldType" );
-		$fieldobject = new $fieldType( $userfield, $animal );
-		//create empty string
-		$lookupvalues = "";
-		if ($userfield->active() && $userfield->inlist())
-		{
-			if ($userfield->haslookup())
-			{
-				$lookupvalues = $userfield->lookup($fields[$i]);
-				//debug information
-				//print_r($lookupvalues);	
-			}
-			$columns[] = array ('columnname' => $fieldobject->fieldname, 'columnnumber' => $userfield->getID(), 'lookupval' => $lookupvalues);
-			$numofcolumns++;
-			unset($lookupvalues);
-		}
-	}
-	
-	for ($i = 1; $i < ($numofcolumns); $i++)
-	{
-		$empty[] = array ('value' => "");		
-	}
-	$dogs [] = array ('id' => "0", 'name' => "", 'gender' => "", 'link' => "<a href=\"add_dog.php?f=check&random=".$random."&seldam=0\">".strtr(_MA_PEDIGREE_ADD_DAMUNKNOWN, array( '[mother]' => $moduleConfig['mother'] ))."</a>", 'colour' => "", 'number' => "", 'usercolumns' => $empty);
+    //check for access
+    $xoopsModule =& XoopsModule::getByDirname("pedigree");
+    if (empty($xoopsUser)) {
+        redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
+        exit();
+    }
+    if (empty($random)) { $random = isset($_POST['random']) ? $_POST['random'] : null; }
+    if (isset($_GET['random'])) { $random = $_GET['random']; }
+    if (empty($st)) { $st=0; }
+    if (isset($_GET['st'])) { $st=$_GET['st']; }
+    //find letter on which to start else set to 'a'
+    if (isset($_GET['l'])) { $l=$_GET['l']; } else { $l="a"; }
+    //make the redirect
+    if (!isset($_GET['r'])) {
+        //insert into pedigree_temp
+        $query = "UPDATE ".$xoopsDB->prefix("mod_pedigree_temp")." SET father =".$_GET['selsire']." WHERE ID=".$random;
+        $xoopsDB->queryf($query);
+        redirect_header("add_dog.php?f=dam&random=".$random."&st=".$st."&r=1&l=a", 1, strtr(_MA_PEDIGREE_ADD_SIREOK, array( '[mother]' => $moduleConfig['mother'] )));
+    }
 
-	while ($row = $xoopsDB->fetchArray($result)) 
-	{
-		//create picture information
-		if ($row['foto'] != '')
-		{ $camera = " <img src=\"images/camera.png\">"; }
-		else { $camera = ""; }
-		$name = stripslashes($row['NAAM']).$camera;
-		//empty array
-		unset($columnvalue);
-		//fill array
-		for ($i = 1; $i < ($numofcolumns); $i++)
-		{
-			$x = $columns[$i]['columnnumber'];
-			if (is_array($columns[$i]['lookupval']))
-			{
-				foreach ($columns[$i]['lookupval'] as $key => $keyvalue)
-				{
-					if($key == $row['user'.$x])
-					{
-						$value = $keyvalue['value'];
-					}	
-				}	
-				//debug information
-				///echo $columns[$i]['columnname']."is an array !";
-			}
-			//format value - cant use object because of query count
-			elseif (substr($row['user'.$x], 0, 7) == 'http://')
-			{
-				$value = "<a href=\"".$row['user'.$x]."\">".$row['user'.$x]."</a>";	
-			}
-			else { $value = $row['user'.$x]; }		
-			$columnvalue[] = array ('value' => $value);	
-		}
-		$dogs[] = array ('id' => $row['ID'], 'name' => $name, 'gender' => '<img src="images/female.gif">', 'link' => "<a href=\"add_dog.php?f=check&random=".$random."&seldam=".$row['ID']."\">".$name."</a>",'colour' => "", 'number' => "", 'usercolumns' => $columnvalue);	
-	}
-		
-	
-	//add data to smarty template
-	//assign dog
-	$xoopsTpl->assign("dogs", $dogs);
-	$xoopsTpl->assign("columns", $columns);
-	$xoopsTpl->assign("numofcolumns", $numofcolumns);
-	$xoopsTpl->assign("tsarray", sorttable($numofcolumns));
-	$xoopsTpl->assign("nummatch", strtr(_MA_PEDIGREE_ADD_SELDAM, array( '[mother]' => $moduleConfig['mother'] )));
-	$xoopsTpl->assign("pages", $pages);	
+    $xoopsTpl->assign("sire", "1");
+    //create list of males dog to select from
+    $perp = $moduleCo...
 
[truncated message content]