[Xoops-svn] SF.net SVN: xoops-svn:[12865] XoopsModules/pedigree/trunk/pedigree

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

Revision: 12865
          http://sourceforge.net/p/xoops/svn/12865
Author:   beckmi
Date:     2014-11-22 07:03:35 +0000 (Sat, 22 Nov 2014)
Log Message:
-----------
Alpha 5 (work in progress)

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/admin_footer.php
    XoopsModules/pedigree/trunk/pedigree/admin/index.php
    XoopsModules/pedigree/trunk/pedigree/admin/menu.php
    XoopsModules/pedigree/trunk/pedigree/admin/owner.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/admin/tools.php
    XoopsModules/pedigree/trunk/pedigree/advanced.php
    XoopsModules/pedigree/trunk/pedigree/assets/css/magnific-popup.css
    XoopsModules/pedigree/trunk/pedigree/book.php
    XoopsModules/pedigree/trunk/pedigree/breeder.php
    XoopsModules/pedigree/trunk/pedigree/class/breadcrumb.php
    XoopsModules/pedigree/trunk/pedigree/coi.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/footer.php
    XoopsModules/pedigree/trunk/pedigree/header.php
    XoopsModules/pedigree/trunk/pedigree/include/class_field.php
    XoopsModules/pedigree/trunk/pedigree/include/common.php
    XoopsModules/pedigree/trunk/pedigree/include/config.php
    XoopsModules/pedigree/trunk/pedigree/include/functions.php
    XoopsModules/pedigree/trunk/pedigree/include/search.inc.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/mpedigree.php
    XoopsModules/pedigree/trunk/pedigree/owner.php
    XoopsModules/pedigree/trunk/pedigree/pedigree.php
    XoopsModules/pedigree/trunk/pedigree/pedigree2.php
    XoopsModules/pedigree/trunk/pedigree/print.php
    XoopsModules/pedigree/trunk/pedigree/result.php
    XoopsModules/pedigree/trunk/pedigree/seldog.php
    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/virtual.php
    XoopsModules/pedigree/trunk/pedigree/welcome.php
    XoopsModules/pedigree/trunk/pedigree/xoops_version.php

Added Paths:
-----------
    XoopsModules/pedigree/trunk/pedigree/assets/css/style.css
    XoopsModules/pedigree/trunk/pedigree/assets/images/logo.png
    XoopsModules/pedigree/trunk/pedigree/class/pedigreeUtilities.php
    XoopsModules/pedigree/trunk/pedigree/library/
    XoopsModules/pedigree/trunk/pedigree/library/Zebra_Image.php
    XoopsModules/pedigree/trunk/pedigree/library/index.html
    XoopsModules/pedigree/trunk/pedigree/templates/admin/animal_admin_about.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/admin/animal_admin_help.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_block_one.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_block_two.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_menu.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_random.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_adddog.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_addlitter.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_advanced.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_book.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_breeder.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_coi.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_common_breadcrumb.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_common_letterschoice.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_delete.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_dog.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_edit.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_footer.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_header.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_index (2).tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_index.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_latest.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_members.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_mpedigree.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_owner.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_pedigree.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_result.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_sel.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_tools.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_update.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_virtual.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_welcome.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/pedigreel_footer.tpl
    XoopsModules/pedigree/trunk/pedigree/templates/table_sort.tpl

Removed Paths:
-------------
    XoopsModules/pedigree/trunk/pedigree/assets/images/pedigree.png
    XoopsModules/pedigree/trunk/pedigree/extra/smartclone/plugins/XOOPS2.5_mod_Pedigree_1.31_Alpha1_xoops.zip
    XoopsModules/pedigree/trunk/pedigree/phpthumb/
    XoopsModules/pedigree/trunk/pedigree/templates/admin/animal_admin_about.html
    XoopsModules/pedigree/trunk/pedigree/templates/admin/animal_admin_help.html
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_block_one.html
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_block_two.html
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_menu.html
    XoopsModules/pedigree/trunk/pedigree/templates/blocks/pedigree_random.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_adddog.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_addlitter.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_advanced.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_book.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_breeder.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_coi.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_common_breadcrumb.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_common_letterschoice.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_delete.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_dog.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_edit.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_footer.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_header.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_index (2).html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_index.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_latest.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_members.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_mpedigree.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_owner.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_pedigree.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_result.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_sel.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_tools.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_update.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_virtual.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigree_welcome.html
    XoopsModules/pedigree/trunk/pedigree/templates/pedigreel_footer.html
    XoopsModules/pedigree/trunk/pedigree/templates/table_sort.html

Modified: XoopsModules/pedigree/trunk/pedigree/add_breeder.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/add_breeder.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/add_breeder.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -16,7 +16,7 @@
 // Include any common code for this module.
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 
-$xoopsOption['template_main'] = "pedigree_adddog.html";
+$xoopsOption['template_main'] = "pedigree_adddog.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 $xoopsTpl->assign('page_title', "Pedigree database - Add owner/breeder");

Modified: XoopsModules/pedigree/trunk/pedigree/add_dog.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/add_dog.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/add_dog.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -17,7 +17,7 @@
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
 
-$xoopsOption['template_main'] = "pedigree_adddog.html";
+$xoopsOption['template_main'] = "pedigree_adddog.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 $xoopsTpl->assign('page_title', "Pedigree database - Update details");
@@ -391,7 +391,7 @@
     while ($row = $xoopsDB->fetchArray($result)) {
         //create picture information
         if ($row['foto'] != '') {
-            $camera = " <img src=\"images/camera.png\">";
+            $camera = " <img src=\"assets/images/camera.png\">";
         } else {
             $camera = "";
         }
@@ -420,7 +420,7 @@
         $dogs[] = array(
             'id'          => $row['ID'],
             'name'        => $name,
-            'gender'      => '<img src="images/male.gif">',
+            'gender'      => '<img src="assets/images/male.gif">',
             'link'        => "<a href=\"add_dog.php?f=dam&random=" . $random . "&selsire=" . $row['ID'] . "\">" . $name . "</a>",
             'colour'      => "",
             'number'      => "",
@@ -576,7 +576,7 @@
     while ($row = $xoopsDB->fetchArray($result)) {
         //create picture information
         if ($row['foto'] != '') {
-            $camera = " <img src=\"images/camera.png\">";
+            $camera = " <img src=\"assets/images/camera.png\">";
         } else {
             $camera = "";
         }
@@ -605,7 +605,7 @@
         $dogs[] = array(
             'id'          => $row['ID'],
             'name'        => $name,
-            'gender'      => '<img src="images/female.gif">',
+            'gender'      => '<img src="assets/images/female.gif">',
             'link'        => "<a href=\"add_dog.php?f=check&random=" . $random . "&seldam=" . $row['ID'] . "\">" . $name . "</a>",
             'colour'      => "",
             'number'      => "",

Modified: XoopsModules/pedigree/trunk/pedigree/add_litter.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/add_litter.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/add_litter.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -17,7 +17,7 @@
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
 
-$xoopsOption['template_main'] = "pedigree_addlitter.html";
+$xoopsOption['template_main'] = "pedigree_addlitter.tpl";
 include XOOPS_ROOT_PATH . '/header.php';
 $xoopsTpl->assign('page_title', "Pedigree database - add a litter");
 
@@ -219,8 +219,7 @@
             $user{$fields[$i]} = $withinfield;
         }
         //insert into pedigree_temp
-        $query = "INSERT INTO " . $xoopsDB->prefix("pedigree_temp") . " VALUES ('" . $random . "','" . unhtmlentities($name) . "','0','" . $id_breeder . "','" . $userid . "','" . $roft
-            . "','','','', ''";
+        $query = "INSERT INTO " . $xoopsDB->prefix("pedigree_temp") . " VALUES ('" . $random . "','" . unhtmlentities($name) . "','0','" . $id_breeder . "','" . $userid . "','" . $roft . "','','','', ''";
         for ($i = 0; $i < count($fields); ++$i) {
             $userfield   = new Field($fields[$i], $animal->getconfig());
             $fieldType   = $userfield->getSetting("FieldType");
@@ -337,7 +336,7 @@
     while ($row = $xoopsDB->fetchArray($result)) {
         //create picture information
         if ($row['foto'] != '') {
-            $camera = " <img src=\"images/camera.png\">";
+            $camera = " <img src=\"assets/images/camera.png\">";
         } else {
             $camera = "";
         }
@@ -366,7 +365,7 @@
         $dogs[] = array(
             'id'          => $row['ID'],
             'name'        => $name,
-            'gender'      => '<img src="images/male.gif">',
+            'gender'      => '<img src="assets/images/male.gif">',
             'link'        => "<a href=\"add_litter.php?f=dam&random=" . $random . "&selsire=" . $row['ID'] . "\">" . $name . "</a>",
             'colour'      => "",
             'number'      => "",
@@ -516,7 +515,7 @@
     while ($row = $xoopsDB->fetchArray($result)) {
         //create picture information
         if ($row['foto'] != '') {
-            $camera = " <img src=\"images/camera.png\">";
+            $camera = " <img src=\"assets/images/camera.png\">";
         } else {
             $camera = "";
         }
@@ -545,7 +544,7 @@
         $dogs[] = array(
             'id'          => $row['ID'],
             'name'        => $name,
-            'gender'      => '<img src="images/female.gif">',
+            'gender'      => '<img src="assets/images/female.gif">',
             'link'        => "<a href=\"add_litter.php?f=check&random=" . $random . "&seldam=" . $row['ID'] . "\">" . $name . "</a>",
             'colour'      => "",
             'number'      => "",
@@ -589,8 +588,9 @@
             $names   = explode(":", $row['NAAM']);
             for ($c = 1; $c < count($names); ++$c) {
                 $query
-                    = "INSERT INTO " . $xoopsDB->prefix("pedigree_tree") . " VALUES ('','" . addslashes($names[$c]) . "','0','" . $row['id_breeder'] . "','" . $row['user'] . "','" . $genders[$c]
-                    . "','" . $_GET['seldam'] . "','" . $row['father'] . "','',''";
+                    =
+                    "INSERT INTO " . $xoopsDB->prefix("pedigree_tree") . " VALUES ('','" . addslashes($names[$c]) . "','0','" . $row['id_breeder'] . "','" . $row['user'] . "','" . $genders[$c] . "','"
+                    . $_GET['seldam'] . "','" . $row['father'] . "','',''";
                 //create animal object
                 $animal = new Animal();
                 //test to find out how many user fields there are..

Modified: XoopsModules/pedigree/trunk/pedigree/admin/admin_footer.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/admin_footer.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/admin_footer.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -14,15 +14,11 @@
  * @license      GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @package
  * @since
- * @author     XOOPS Development Team
- * @version    $Id $
+ * @author       XOOPS Development Team
+ * @version      $Id $
  */
 
-echo "<div class='adminfooter'>\n"
-    ."  <div style='text-align: center;'>\n"
-    ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-    ."  </div>\n"
-    ."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
-    ."</div>";
+echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+    . "  </div>\n" . "  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>";
 
 xoops_cp_footer();

Modified: XoopsModules/pedigree/trunk/pedigree/admin/index.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/index.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/index.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -20,11 +20,18 @@
 
 require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
 include_once __DIR__ . '/admin_header.php';
+include_once dirname(__DIR__) . '/class/pedigreeUtilities.php';
 
 //xoops_cp_header();
 
 $indexAdmin = new ModuleAdmin();
 
+foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+    pedigreeUtilities::prepareFolder($uploadFolders[$i]);
+    $indexAdmin->addConfigBoxLine($uploadFolders[$i], 'folder');
+//    $indexAdmin->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
+}
+
 echo $indexAdmin->addNavigation('index.php');
 echo $indexAdmin->renderIndex();
 

Modified: XoopsModules/pedigree/trunk/pedigree/admin/menu.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/menu.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/menu.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -43,42 +43,59 @@
 // $adminmenu[1]['link'] = "admin/colors.php";
 // $adminmenu[1]['title'] = "Create colours";
 
-$dirname                = basename(dirname(dirname(__FILE__)));
-$module_handler         =& xoops_gethandler("module");
-$xoopsModule            =& XoopsModule::getByDirname($dirname);
-$moduleInfo             =& $module_handler->get($xoopsModule->getVar("mid"));
-$pathIcon32             = $moduleInfo->getInfo("icons32");
-$adminmenu              = array();
-$i                      = 1;
-$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU1;
-$adminmenu[$i]["link"]  = "admin/index.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . "/home.png";
-++$i;
-$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU2;
-$adminmenu[$i]["link"]  = "admin/pedigree_trash.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . "/alert.png";
-++$i;
-$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU3;
-$adminmenu[$i]["link"]  = "admin/owner.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . "/user-icon.png";
-++$i;
-$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU4;
-$adminmenu[$i]["link"]  = "admin/pedigree_temp.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . "/wizard.png";
-++$i;
-$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU5;
-$adminmenu[$i]["link"]  = "admin/pedigree.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . "/groupmod.png";
-++$i;
-$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU6;
-$adminmenu[$i]["link"]  = "admin/pedigree_config.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . "/administration.png";
-//++$i;
-//$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU7;
-//$adminmenu[$i]["link"] = "admin/permissions.php";
-//$adminmenu[$i]["icon"] = $pathIcon32."/permissions.png";
-++$i;
-$adminmenu[$i]["title"] = _MI_PEDIGREE_ADMENU8;
-$adminmenu[$i]["link"]  = "admin/about.php";
-$adminmenu[$i]["icon"]  = $pathIcon32 . "/about.png";
-unset($i);
+$dirname        = basename(dirname(__DIR__));
+$module_handler =& xoops_gethandler("module");
+$xoopsModule    =& XoopsModule::getByDirname($dirname);
+$moduleInfo     =& $module_handler->get($xoopsModule->getVar("mid"));
+$pathIcon32     = $moduleInfo->getInfo("icons32");
+$adminmenu      = array();
+
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU1,
+    'link'  => 'admin/index.php',
+    'icon'  => $pathIcon32 . '/home.png'
+);
+
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU2,
+    'link'  => 'admin/pedigree_trash.php',
+    'icon'  => $pathIcon32 . '/alert.png'
+);
+
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU3,
+    'link'  => 'admin/owner.php',
+    'icon'  => $pathIcon32 . '/user-icon.png'
+);
+
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU4,
+    'link'  => 'admin/pedigree_temp.php',
+    'icon'  => $pathIcon32 . '/wizard.png'
+);
+
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU5,
+    'link'  => 'admin/pedigree.php',
+    'icon'  => $pathIcon32 . '/groupmod.png'
+);
+
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU6,
+    'link'  => 'admin/pedigree_config.php',
+    'icon'  => $pathIcon32 . '/administration.png'
+);
+
+/*
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU7,
+    'link'  => 'admin/permissions.php',
+    'icon'  => $pathIcon32.'/permissions.png'
+);
+*/
+
+$adminmenu[] = array(
+    'title' => _MI_PEDIGREE_ADMENU8,
+    'link'  => 'admin/about.php',
+    'icon'  => $pathIcon32 . '/about.png'
+);

Modified: XoopsModules/pedigree/trunk/pedigree/admin/owner.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/owner.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/owner.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -28,7 +28,7 @@
     default:
         echo $adminMenu->addNavigation('owner.php');
         $adminMenu->addItemButton(_AM_PEDIGREE_NEWOWNER, 'owner.php?op=new_owner', 'add');
-        echo $adminMenu->renderButton();
+        echo $adminMenu->renderButton('left');
         $criteria = new CriteriaCompo();
         $criteria->setSort("ID");
         $criteria->setOrder("ASC");

Modified: XoopsModules/pedigree/trunk/pedigree/admin/pedigree_config.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/pedigree_config.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/pedigree_config.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -28,7 +28,7 @@
     default:
         echo $adminMenu->addNavigation('pedigree_config.php');
         $adminMenu->addItemButton(_AM_PEDIGREE_NEWPEDIGREE_CONFIG, 'pedigree_config.php?op=new_pedigree_config', 'add');
-        echo $adminMenu->renderButton();
+        echo $adminMenu->renderButton('left');
         $criteria = new CriteriaCompo();
         $criteria->setSort("ID");
         $criteria->setOrder("ASC");

Modified: XoopsModules/pedigree/trunk/pedigree/admin/pedigree_temp.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/pedigree_temp.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/pedigree_temp.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -28,7 +28,7 @@
     default:
         echo $adminMenu->addNavigation('pedigree_temp.php');
         $adminMenu->addItemButton(_AM_PEDIGREE_NEWPEDIGREE_TEMP, 'pedigree_temp.php?op=new_pedigree_temp', 'add');
-        echo $adminMenu->renderButton();
+        echo $adminMenu->renderButton('left');
         $criteria = new CriteriaCompo();
         $criteria->setSort("ID");
         $criteria->setOrder("ASC");

Modified: XoopsModules/pedigree/trunk/pedigree/admin/pedigree_trash.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/pedigree_trash.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/pedigree_trash.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -28,7 +28,7 @@
     default:
         echo $adminMenu->addNavigation('pedigree_trash.php');
         $adminMenu->addItemButton(_AM_PEDIGREE_NEWPEDIGREE_TRASH, 'pedigree_trash.php?op=new_pedigree_trash', 'add');
-        echo $adminMenu->renderButton();
+//        echo $adminMenu->renderButton();
         $criteria = new CriteriaCompo();
         $criteria->setSort("ID");
         $criteria->setOrder("ASC");

Modified: XoopsModules/pedigree/trunk/pedigree/admin/tools.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/tools.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/admin/tools.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -14,7 +14,7 @@
 // Include any common code for this module.
 require_once dirname(__DIR__) . "/include/functions.php";
 
-$xoopsOption['template_main'] = "pedigree_tools.html";
+$xoopsOption['template_main'] = "pedigree_tools.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 $xoopsTpl->assign('page_title', "Pedigree database - Add owner/breeder");
@@ -234,7 +234,7 @@
     $sql    = "SELECT ID, NAAM	FROM " . $xoopsDB->prefix("pedigree_trash");
     $result = $xoopsDB->query($sql);
     while ($row = $xoopsDB->fetchArray($result)) {
-        $form .= "<a href=\"tools.php?op=delperm&id=" . $row['ID'] . "\"><img src=\"images/delete.gif\" /></a>&nbsp;<a href=\"tools.php?op=restore&id=" . $row['ID'] . "\">" . $row['NAAM']
+        $form .= "<a href=\"tools.php?op=delperm&id=" . $row['ID'] . "\"><img src=\"assets/images/delete.gif\" /></a>&nbsp;<a href=\"tools.php?op=restore&id=" . $row['ID'] . "\">" . $row['NAAM']
             . "</a><br />";
     }
     if ($xoopsDB->getRowsNum($result) > 0) {

Modified: XoopsModules/pedigree/trunk/pedigree/advanced.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/advanced.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/advanced.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -18,7 +18,7 @@
 include(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/class_eq_pie.php");
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
 
-$xoopsOption['template_main'] = "pedigree_advanced.html";
+$xoopsOption['template_main'] = "pedigree_advanced.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 // Include any common code for this module.
@@ -63,7 +63,7 @@
 $data[1][1] = $countfemales;
 $data[1][2] = "#FFC8C8";
 
-$numbers_pie->MakePie('images/numbers.png', '200', '200', '10', $odd, $data, '1');
+$numbers_pie->MakePie('assets/images/numbers.png', '200', '200', '10', $odd, $data, '1');
 
 //create animal object
 
@@ -77,8 +77,7 @@
     $fieldobject = new $fieldType($userfield, $animal);
     if ($userfield->active() && $userfield->inadvanced()) {
         $queryString
-                  =
-            "select count(p.user" . $fields[$i] . ") as X, p.user" . $fields[$i] . " as p_user" . $fields[$i] . ", b.ID as b_id, b.value as b_value from " . $xoopsDB->prefix("pedigree_tree")
+                  = "select count(p.user" . $fields[$i] . ") as X, p.user" . $fields[$i] . " as p_user" . $fields[$i] . ", b.ID as b_id, b.value as b_value from " . $xoopsDB->prefix("pedigree_tree")
             . " p LEFT JOIN " . $xoopsDB->prefix("pedigree_lookup" . $fields[$i]) . " b ON p.user" . $fields[$i] . " = b.ID GROUP BY p.user" . $fields[$i] . " ORDER BY X DESC";
         $result   = $xoopsDB->query($queryString);
         $piecount = 0;
@@ -107,10 +106,10 @@
             } else {
                 $back = $odd;
             }
-if (isset($data)) {
-            $pie->MakePie('images/user' . $fields[$i] . '.png', '200', '200', '10', $back, $data, '1');
-            unset($pie);
-}
+            if (isset($data)) {
+                $pie->MakePie('images/user' . $fields[$i] . '.png', '200', '200', '10', $back, $data, '1');
+                unset($pie);
+            }
             $books[] = array('book' => "Chart", 'country' => '<img src="images/user' . $fields[$i] . '.png">');
         }
         $totpl[] = array('title' => $userfield->getSetting("FieldName"), 'content' => $books);
@@ -127,15 +126,15 @@
 $xoopsTpl->assign("tnmftitle", strtr(_MA_PEDIGREE_ADV_TNMFTIT, array('[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female'])));
 $xoopsTpl->assign(
     "countmales",
-    "<img src=\"images/male.gif\"> " . strtr(_MA_PEDIGREE_ADV_TCMA, array('[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female'])) . " : <a href=\"result.php?f=roft&w=zero&o=NAAM\">"
-    . $countmales . "</a>"
+    "<img src=\"assets/images/male.gif\"> " . strtr(_MA_PEDIGREE_ADV_TCMA, array('[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female']))
+    . " : <a href=\"result.php?f=roft&w=zero&o=NAAM\">" . $countmales . "</a>"
 );
 $xoopsTpl->assign(
     "countfemales",
-    "<img src=\"images/female.gif\"> " . strtr(_MA_PEDIGREE_ADV_TCFE, array('[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female'])) . " : <a href=\"result.php?f=roft&w=1&o=NAAM\">"
-    . $countfemales
+    "<img src=\"assets/images/female.gif\"> " . strtr(_MA_PEDIGREE_ADV_TCFE, array('[male]' => $moduleConfig['male'], '[female]' => $moduleConfig['female']))
+    . " : <a href=\"result.php?f=roft&w=1&o=NAAM\">" . $countfemales
 ) . "</a>";
-$xoopsTpl->assign("pienumber", "<img src=\"images/numbers.png\">");
+$xoopsTpl->assign("pienumber", "<img src=\"assets/images/numbers.png\">");
 $xoopsTpl->assign("totpl", $totpl);
 $xoopsTpl->assign("books", $books);
 

Modified: XoopsModules/pedigree/trunk/pedigree/assets/css/magnific-popup.css
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/assets/css/magnific-popup.css	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/assets/css/magnific-popup.css	2014-11-22 07:03:35 UTC (rev 12865)
@@ -1,4 +1,10 @@
 /* Magnific Popup CSS */
+.image-link {
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in;
+}
+
 .mfp-bg {
     top: 0;
     left: 0;

Added: XoopsModules/pedigree/trunk/pedigree/assets/css/style.css
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/assets/css/style.css	                        (rev 0)
+++ XoopsModules/pedigree/trunk/pedigree/assets/css/style.css	2014-11-22 07:03:35 UTC (rev 12865)
@@ -0,0 +1,46 @@
+.verticalcenter {
+  position: relative;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+div.container3 {
+   height: 10em;
+   position: relative               /* 1 */
+}
+div.container3 p {
+   margin: 0;
+   position: absolute;               /* 2 */
+   top: 50%;                         /* 3 */
+   transform: translate(0, -20%)    /* 4 */
+}
+
+
+
+.block {
+  text-align: center;
+  background: #c0c0c0;
+  border: #a0a0a0 solid 1px;
+  margin: 20px;
+}
+
+.block:before {
+  content: '';
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle;
+  margin-right: -0.25em; /* Adjusts for spacing */
+
+  /* For visualization
+  background: #808080; width: 5px;
+  */
+ }
+
+.centered {
+  display: inline-block;
+  vertical-align: middle;
+  width: 300px;
+  padding: 10px 15px;
+  border: #a0a0a0 solid 1px;
+  background: #f5f5f5;
+ }

Added: XoopsModules/pedigree/trunk/pedigree/assets/images/logo.png
===================================================================
(Binary files differ)

Index: XoopsModules/pedigree/trunk/pedigree/assets/images/logo.png
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/assets/images/logo.png	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/assets/images/logo.png	2014-11-22 07:03:35 UTC (rev 12865)

Property changes on: XoopsModules/pedigree/trunk/pedigree/assets/images/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: XoopsModules/pedigree/trunk/pedigree/assets/images/pedigree.png
===================================================================
(Binary files differ)

Modified: XoopsModules/pedigree/trunk/pedigree/book.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/book.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/book.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -16,7 +16,7 @@
 // Include any common code for this module.
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 
-$xoopsOption['template_main'] = "pedigree_book.html";
+$xoopsOption['template_main'] = "pedigree_book.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 

Modified: XoopsModules/pedigree/trunk/pedigree/breeder.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/breeder.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/breeder.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -20,7 +20,7 @@
 extract($_GET, EXTR_PREFIX_ALL, "param");
 extract($_POST, EXTR_PREFIX_ALL, "param");
 
-$xoopsOption['template_main'] = "pedigree_breeder.html";
+$xoopsOption['template_main'] = "pedigree_breeder.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 // Include any common code for this module.
@@ -148,8 +148,8 @@
     $access = "";
     if (!empty($xoopsUser)) {
         if ($row['user'] == $xoopsUser->getVar("uid") || $modadmin == true) {
-            //$access = "<a href=\"dog.php?id=".$row['ID']."\"><img src=\"images/edit.gif\" alt="._MA_PEDIGREE_BTN_EDIT."></a>";
-            $access .= "<a href=\"deletebreeder.php?id=" . $row['ID'] . "\"><img src=\"images/delete.gif\" alt=" . _MA_PEDIGREE_BTN_DELE . "></a>";
+            //$access = "<a href=\"dog.php?id=".$row['ID']."\"><img src=\"assets/images/edit.gif\" alt="._MA_PEDIGREE_BTN_EDIT."></a>";
+            $access .= "<a href=\"deletebreeder.php?id=" . $row['ID'] . "\"><img src=\"assets/images/delete.gif\" alt=" . _MA_PEDIGREE_BTN_DELE . "></a>";
         } else {
             $access = "";
         }

Modified: XoopsModules/pedigree/trunk/pedigree/class/breadcrumb.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/class/breadcrumb.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/class/breadcrumb.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -32,8 +32,8 @@
  */
 class PedigreeBreadcrumb
 {
-    var $dirname;
-    var $_bread = array();
+    public $dirname;
+    private $bread = array();
 
     /**
      *
@@ -51,7 +51,7 @@
      */
     function addLink($title = '', $link = '')
     {
-        $this->_bread[] = array(
+        $this->bread[] = array(
             'link'  => $link,
             'title' => $title
         );
@@ -70,8 +70,8 @@
 
         require_once $GLOBALS['xoops']->path('class/template.php');
         $breadcrumbTpl = new XoopsTpl();
-        $breadcrumbTpl->assign('breadcrumb', $this->_bread);
-        $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.html");
+        $breadcrumbTpl->assign('breadcrumb', $this->bread);
+        $html = $breadcrumbTpl->fetch("db:" . $this->dirname . "_common_breadcrumb.tpl");
         unset($breadcrumbTpl);
 
         return $html;

Added: XoopsModules/pedigree/trunk/pedigree/class/pedigreeUtilities.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/class/pedigreeUtilities.php	                        (rev 0)
+++ XoopsModules/pedigree/trunk/pedigree/class/pedigreeUtilities.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: Mamba
+ * Date: 2014-11-19
+ * Time: 3:05
+ */
+class pedigreeUtilities
+{
+
+    /**
+     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+     *
+     * @param string $folder Le chemin complet du r\xE9pertoire \xE0 v\xE9rifier
+     *
+     * @return void
+     */
+    public static function prepareFolder($folder)
+    {
+        if (!is_dir($folder)) {
+            mkdir($folder, 0777);
+            file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+        }
+        chmod($folder, 0777);
+    }
+}


Property changes on: XoopsModules/pedigree/trunk/pedigree/class/pedigreeUtilities.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/pedigree/trunk/pedigree/coi.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/coi.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/coi.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -15,7 +15,7 @@
 
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 
-$xoopsOption['template_main'] = "pedigree_coi.html";
+$xoopsOption['template_main'] = "pedigree_coi.tpl";
 include XOOPS_ROOT_PATH . '/header.php';
 
 //get module configuration
@@ -169,6 +169,7 @@
     } else {
         $record = mysql_fetch_array($r);
     }
+
     return $record;
 }
 
@@ -192,6 +193,7 @@
     if ($d && $gen < $nb_gen) {
         count_all($d, $gen + 1);
     }
+
     return 0;
 }
 
@@ -520,6 +522,7 @@
     if (!$dmax) {
         $dmax = 2 * $nb_gen - 2;
     }
+
     return $distan;
 }
 
@@ -540,34 +543,33 @@
     if ($p == $m)   /* IMPLEX FOUND (node of consanguinity) { for Anim #A */ {
         $already_known = isset($ICknown[$p]) ? $ICknown[$p] : 0;
 
-    if (!$already_known) {
-        CONSANG($p);
-    }  // MAIN RECURSION:
-    $ICp = isset($COIs[$p]) ? $COIs[$p] : 0;                    // we need to know the IC of Parent for Wright's formula
-    if ($verbose && !$already_known && $ICp > 0.001 * $verbose) {
-        echo "IC of Animal $p is $ICp$nl";
-    }
+        if (!$already_known) {
+            CONSANG($p);
+        }  // MAIN RECURSION:
+        $ICp = isset($COIs[$p]) ? $COIs[$p] : 0;                    // we need to know the IC of Parent for Wright's formula
+        if ($verbose && !$already_known && $ICp > 0.001 * $verbose) {
+            echo "IC of Animal $p is $ICp$nl";
+        }
 
-    $incr = 1.0 / (1 << $ndist) * (1. + $ICp);    // ******** applying WRIGHT's formula ********
+        $incr = 1.0 / (1 << $ndist) * (1. + $ICp);    // ******** applying WRIGHT's formula ********
 
-    // [Note:  1 << $ndist is equal to 2 power $ndist]
-    $COIs[$a] = isset($COIs[$a]) ? $COIs[$a] : 0;
-    $COIs[$a] += $incr;  // incrementing the IC of AnimC
-    if ($a == 0) {
-        $deltaf[$p] += $incr;
-    }
-    /* contribution of Anim #P to IC of Anim #0 */
-    // if ($verbose && $a == 0 && $incr > 0.0001*$verbose)
-    //    echo "Animal $p is contributing for " . substr ($deltaf[$p], 0, 10) . " to the IC of Animal $a$nl" ;
+        // [Note:  1 << $ndist is equal to 2 power $ndist]
+        $COIs[$a] = isset($COIs[$a]) ? $COIs[$a] : 0;
+        $COIs[$a] += $incr;  // incrementing the IC of AnimC
+        if ($a == 0) {
+            $deltaf[$p] += $incr;
+        }
+        /* contribution of Anim #P to IC of Anim #0 */
+        // if ($verbose && $a == 0 && $incr > 0.0001*$verbose)
+        //    echo "Animal $p is contributing for " . substr ($deltaf[$p], 0, 10) . " to the IC of Animal $a$nl" ;
 
-   }
-    else {
+    } else {
         if (!$marked[$m] && $chrono[$m] < $paternal_rank) {
             mater_side($p, $fathers[$m], $a, $ndist + 1);
 
-        mater_side($p, $mothers[$m], $a, $ndist + 1);
+            mater_side($p, $mothers[$m], $a, $ndist + 1);
+        }
     }
-}
 
     return 0;
 }
@@ -619,6 +621,7 @@
     if (!$p || !$m) {
         $COIs[$a]    = $IC_if_deadend;
         $ICknown[$a] = 2;
+
         return 0;
     }
 
@@ -699,6 +702,7 @@
     if ($new) {
         $nbtot = 0;
     }  /* Endless loop detected (see listing) */
+
     return $nbtot;
 }
 
@@ -711,14 +715,14 @@
 {
     global $sql2, $sql2bis, $xoopsDB;
     $name = ' ';
-    $ani = array();
+    $ani  = array();
     if ($ID) {
         $sqlquery    = "SELECT ID, NAAM, roft from " . $xoopsDB->prefix("pedigree_tree") . " where ID = '$ID'";
         $queryresult = mysql_query($sqlquery);
         $ani         = mysql_fetch_array($queryresult);
 //        $name        = $ani[1];
         if ($sql2bis) {  // true for E.R.o'S. only
-        $name = html_accents ($name) ;
+            $name = html_accents($name);
             //$affx = $ani[5] ;  // affix-ID
             if ($affx) {
                 $affix  = fetch_record("$sql2bis '$affx'");
@@ -786,10 +790,10 @@
         $content .= $val;
     }
     if ($sex == 1) {
-        $geslacht = "<img src=\"images/female.gif\">";
+        $geslacht = "<img src=\"assets/images/female.gif\">";
     }
     if ($sex == 0) {
-        $geslacht = "<img src=\"images/male.gif\">";
+        $geslacht = "<img src=\"assets/images/male.gif\">";
     }
     $content .= "</td><td>" . $geslacht . "</td><td>" . $nb_children . _MA_PEDIGREE_COI_OFF . '</td></tr>';
 
@@ -845,7 +849,9 @@
     $a           = $rowhond['ID'];
     $s           = $rowhond['father'];
     $d           = $rowhond['mother'];
-} else {$a = 0;}
+} else {
+    $a = 0;
+}
 $a += 0;
 $s += 0;
 $d += 0;            // [IDs are numbers]
@@ -1119,7 +1125,7 @@
         CONSANG(2);
     }    // Dam
 //    $COR = 2.0 * $COIs[0] / sqrt((1. + $COIs[1]) * (1. + $COIs[2]));
-      $COR = 2.0 * (isset($COIs[0]) ? $COIs[0] : 0) / sqrt((1. + (isset($COIs[1]) ? $COIs[1] : 0)) * (1. + (isset($COIs[2]) ? $COIs[2] : 0)));
+    $COR = 2.0 * (isset($COIs[0]) ? $COIs[0] : 0) / sqrt((1. + (isset($COIs[1]) ? $COIs[1] : 0)) * (1. + (isset($COIs[2]) ? $COIs[2] : 0)));
     $COR = substr($COR, 0, 8);
     if (!$COR) {
         $COR = "n.a.";

Modified: XoopsModules/pedigree/trunk/pedigree/delete.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/delete.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/delete.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -16,7 +16,7 @@
 // Include any common code for this module.
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 
-$xoopsOption['template_main'] = "pedigree_delete.html";
+$xoopsOption['template_main'] = "pedigree_delete.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 

Modified: XoopsModules/pedigree/trunk/pedigree/deletebreeder.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/deletebreeder.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/deletebreeder.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -16,7 +16,7 @@
 // Include any common code for this module.
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 
-$xoopsOption['template_main'] = "pedigree_delete.html";
+$xoopsOption['template_main'] = "pedigree_delete.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 

Modified: XoopsModules/pedigree/trunk/pedigree/deletebreederpage.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/deletebreederpage.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/deletebreederpage.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -16,7 +16,7 @@
 // Include any common code for this module.
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 
-$xoopsOption['template_main'] = "pedigree_delete.html";
+$xoopsOption['template_main'] = "pedigree_delete.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 

Modified: XoopsModules/pedigree/trunk/pedigree/deletepage.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/deletepage.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/deletepage.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -17,7 +17,7 @@
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/functions.php");
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
 
-$xoopsOption['template_main'] = "pedigree_delete.html";
+$xoopsOption['template_main'] = "pedigree_delete.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 
@@ -49,8 +49,7 @@
             }
         }
         if ($access == "1") {
-            $sql = "INSERT INTO " . $xoopsDB->prefix("pedigree_trash") . " SELECT * FROM " . $xoopsDB->prefix("pedigree_tree") . " WHERE " . $xoopsDB->prefix("pedigree_tree") . ".ID='"
-                . $dogid . "'";
+            $sql = "INSERT INTO " . $xoopsDB->prefix("pedigree_trash") . " SELECT * FROM " . $xoopsDB->prefix("pedigree_tree") . " WHERE " . $xoopsDB->prefix("pedigree_tree") . ".ID='" . $dogid . "'";
             mysql_query($sql);
             $delsql = "DELETE FROM " . $xoopsDB->prefix("pedigree_tree") . " WHERE ID ='" . $row['ID'] . "'";
             mysql_query($delsql);

Modified: XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt	2014-11-22 07:03:35 UTC (rev 12865)
@@ -1,16 +1,28 @@
 ---------------------------------------
+1.31 Alpha 5  NOT RELEASED
+---------------------------------------
+
+- replaced phpThumbnail with Zebra Image (mamba)
+- added "Magnific Popup" for images (mamba)
+- moved uploads to /uploads/pedigree (mamba)
+- simplified creation of upload folders, based on Hervet's Oledrion (mamba)
+- renamed templates from .html to .tpl (mamba)
+- moved images, .js and css files  to /assets (mamba)
+
+
+
+TODO:
+- updated Alphabet listing with Highlights (mamba)
+
+
+---------------------------------------
 1.31 Alpha 4  NOT RELEASED
 ---------------------------------------
 
 - changes to COI templates  (mamba)
 - replaced ColorPicker with jsColor (mamba)
 - English corrections (mamba)
--
 
-TODO:
-- add Zebra Image
--
-
 ---------------------------------------
 1.31 Alpha 3  2014-01-25
 ---------------------------------------

Modified: XoopsModules/pedigree/trunk/pedigree/dog.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/dog.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/dog.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -2,6 +2,7 @@
 // -------------------------------------------------------------------------
 
 require_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once __DIR__ . '/include/config.php';
 
 /*
 if (file_exists(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/language/" . $xoopsConfig['language'] . "/main.php")) {
@@ -10,9 +11,9 @@
     include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/language/english/main.php";
 }
 */
+$mydirname = basename(__DIR__);
+xoops_loadLanguage('main', $mydirname);
 
-xoops_loadLanguage('main', basename(dirname(__DIR__)));
-
 // 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");
@@ -22,15 +23,28 @@
 extract($_GET, EXTR_PREFIX_ALL, "param");
 extract($_POST, EXTR_PREFIX_ALL, "param");
 
-$xoopsOption['template_main'] = "pedigree_dog.html";
+$xoopsOption['template_main'] = "pedigree_dog.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 
+$GLOBALS['xoTheme']->addScript("browse.php?Frameworks/jquery/jquery.js");
+$GLOBALS['xoTheme']->addScript("browse.php?modules/" . $mydirname . "/assets/js/jquery.magnific-popup.min.js");
+//$GLOBALS['xoTheme']->addStylesheet("browse.php?modules/".$mydirname ."/assets/css/magnific-popup.css");
+
+$GLOBALS['xoTheme']->addStylesheet(PEDIGREE_URL . '/assets/css/magnific-popup.css');
+
+if (isset($GLOBALS['xoTheme'])) {
+    $GLOBALS['xoTheme']->addScript('include/color-picker.js');
+} else {
+    echo '<script type="text/javascript" src="' . XOOPS_URL . '/include/color-picker.js"></script>';
+}
+
 global $xoopsUser, $xoopsTpl, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
 
 $pathIcon16 = $xoopsModule->getInfo('icons16');
 
 xoops_load('XoopsUserUtility');
+$dam = $sire = '';
 
 //get module configuration
 $module_handler =& xoops_gethandler('module');
@@ -81,33 +95,34 @@
     }
     //gender
     if ($row['roft'] == 0) {
-        $gender = "<img src=\"images/male.gif\"> " . strtr(_MA_PEDIGREE_FLD_MALE, array('[male]' => $moduleConfig['male']));
+        $gender = "<img src=\"assets/images/male.gif\"> " . strtr(_MA_PEDIGREE_FLD_MALE, array('[male]' => $moduleConfig['male']));
     } else {
-        $gender = "<img src=\"images/female.gif\"> " . strtr(_MA_PEDIGREE_FLD_FEMA, array('[female]' => $moduleConfig['female']));
+        $gender = "<img src=\"assets/images/female.gif\"> " . strtr(_MA_PEDIGREE_FLD_FEMA, array('[female]' => $moduleConfig['female']));
     }
     //Sire
     if ($row['father'] != 0) {
         $querysire = "SELECT NAAM from " . $xoopsDB->prefix("pedigree_tree") . " WHERE ID=" . $row['father'];
         $ressire   = $xoopsDB->query($querysire);
         while ($rowsire = $xoopsDB->fetchArray($ressire)) {
-            $sire = "<img src=\"images/male.gif\"><a href=\"dog.php?id=" . $row['father'] . "\">" . stripslashes($rowsire['NAAM']) . "</a>";
+            $sire = "<img src=\"assets/images/male.gif\"><a href=\"dog.php?id=" . $row['father'] . "\">" . stripslashes($rowsire['NAAM']) . "</a>";
         }
     } else {
-        $sire = "<img src=\"images/male.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=0&letter=a\">" . _MA_PEDIGREE_UNKNOWN . "</a>";
+        $sire = "<img src=\"assets/images/male.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=0&letter=a\">" . _MA_PEDIGREE_UNKNOWN . "</a>";
     }
     //Dam
     if ($row['mother'] != 0) {
         $querydam = "SELECT NAAM from " . $xoopsDB->prefix("pedigree_tree") . " WHERE ID=" . $row['mother'];
         $resdam   = $xoopsDB->query($querydam);
         while ($rowdam = $xoopsDB->fetchArray($resdam)) {
-            $dam = "<img src=\"images/female.gif\"><a href=\"dog.php?id=" . $row['mother'] . "\">" . stripslashes($rowdam['NAAM']) . "</a>";
+            $dam = "<img src=\"assets/images/female.gif\"><a href=\"dog.php?id=" . $row['mother'] . "\">" . stripslashes($rowdam['NAAM']) . "</a>";
         }
     } else {
-        $dam = "<img src=\"images/female.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=1&letter=a\">" . _MA_PEDIGREE_UNKNOWN . "</a>";
+        $dam = "<img src=\"assets/images/female.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=1&letter=a\">" . _MA_PEDIGREE_UNKNOWN . "</a>";
     }
     //picture
     if ($row['foto'] != "") {
-        $picture = "<img src=images/thumbnails/" . $row['foto'] . "_400.jpeg>";
+        $picture    = "<img src=" . PEDIGREE_UPLOAD_URL . "/images/thumbnails/" . $row['foto'] . "_400.jpeg>";
+        $pictureBig = "<img src=" . PEDIGREE_UPLOAD_URL . "/images/" . $row['foto'] . ">";
     } else {
         $picture = "<a href=\"update.php?id=" . $row['ID'] . "&fld=pc\">" . _MA_PEDIGREE_UNKNOWN . "</a>";
     }

Modified: XoopsModules/pedigree/trunk/pedigree/edit.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/edit.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/edit.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -2,6 +2,7 @@
 // -------------------------------------------------------------------------
 
 require_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once __DIR__ . '/include/config.php';
 
 /*
 if (file_exists(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/language/" . $xoopsConfig['language'] . "/main.php")) {
@@ -11,14 +12,14 @@
 }
 */
 
-xoops_loadLanguage('main', basename(dirname(__DIR__)));
+xoops_loadLanguage('main', basename(__DIR__));
 
 //needed for generation of pie charts
 ob_start();
 include(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/class_eq_pie.php");
 require_once(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
 
-$xoopsOption['template_main'] = "pedigree_edit.html";
+$xoopsOption['template_main'] = "pedigree_edit.tpl";
 
 include XOOPS_ROOT_PATH . '/header.php';
 // Include any common code for this module.
@@ -113,7 +114,7 @@
                 $form->addElement(
                     new XoopsFormLabel(
                         "<b>" . strtr(_MA_PEDIGREE_FLD_FATH, array('[father]' => $moduleConfig['father'])) . "</b>",
-                        "<img src=\"images/male.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=1&letter=a\">" . $rowfetch['NAAM'] . "</a>"
+                        "<img src=\"assets/images/male.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=1&letter=a\">" . $rowfetch['NAAM'] . "</a>"
                     )
                 );
             }
@@ -121,7 +122,7 @@
             $form->addElement(
                 new XoopsFormLabel(
                     "<b>" . strtr(_MA_PEDIGREE_FLD_FATH, array('[father]' => $moduleConfig['father'])) . "</b>",
-                    "<img src=\"images/male.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=1&letter=a\">Unknown</a>"
+                    "<img src=\"assets/images/male.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=1&letter=a\">Unknown</a>"
                 )
             );
         }
@@ -134,7 +135,7 @@
                 $form->addElement(
                     new XoopsFormLabel(
                         "<b>" . strtr(_MA_PEDIGREE_FLD_MOTH, array('[mother]' => $moduleConfig['mother'])) . "</b>",
-                        "<img src=\"images/female.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=0&letter=a\">" . $rowfetch['NAAM'] . "</a>"
+                        "<img src=\"assets/images/female.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=0&letter=a\">" . $rowfetch['NAAM'] . "</a>"
                     )
                 );
             }
@@ -142,7 +143,7 @@
             $form->addElement(
                 new XoopsFormLabel(
                     "<b>" . strtr(_MA_PEDIGREE_FLD_MOTH, array('[mother]' => $moduleConfig['mother'])) . "</b>",
-                    "<img src=\"images/female.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=0&letter=a\">Unknown</a>"
+                    "<img src=\"assets/images/female.gif\"><a href=\"seldog.php?curval=" . $row['ID'] . "&gend=0&letter=a\">Unknown</a>"
                 )
             );
         }
@@ -168,7 +169,7 @@
         }
         //picture
         if ($row['foto'] != "") {
-            $picture = "<img src=images/thumbnails/" . $row['foto'] . "_400.jpeg>";
+            $picture = "<img src=" . PEDIGREE_UPLOAD_URL . "/images/thumbnails" . $row['foto'] . "_400.jpeg>";
             $form->addElement(new XoopsFormLabel('<b>Picture</b>', $picture));
         } else {
             $picture = "";

Deleted: XoopsModules/pedigree/trunk/pedigree/extra/smartclone/plugins/XOOPS2.5_mod_Pedigree_1.31_Alpha1_xoops.zip
===================================================================
(Binary files differ)

Modified: XoopsModules/pedigree/trunk/pedigree/footer.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/footer.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/footer.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -19,7 +19,7 @@
  * @version         svn:$id$
  */
 $uid = is_object($xoopsUser) ? (int)$xoopsUser->getVar('uid') : 0;
-
+/*
 $xoopsTpl->assign("wfdownloads_adminpage", "<a href='" . PEDIGREE_URL . "/admin/index.php'>" . _MD_PEDIGREE_ADMIN_PAGE . "</a>");
 
 $xoopsTpl->assign("isAdmin", $wfdownloads_isAdmin);
@@ -29,5 +29,50 @@
     "ref_smartfactory",
     "WFDownloads is developed by The SmartFactory (http://www.smartfactory.ca), a division of InBox Solutions (http://www.inboxsolutions.net)"
 );
+*/
+include_once XOOPS_ROOT_PATH . '/footer.php';
 
-include_once XOOPS_ROOT_PATH . '/footer.php';
+?>
+<script type="text/javascript">
+
+    $('.magnific_zoom').magnificPopup({
+        type               : 'image',
+        image              : {
+            cursor     : 'mfp-zoom-out-cur',
+            titleSrc   : "title",
+            verticalFit: true,
+            tError     : 'The image could not be loaded.' // Error message
+        },
+        iframe             : {
+            patterns: {
+                youtube : {
+                    index: 'youtube.com/',
+                    id   : 'v=',
+                    src  : '//www.youtube.com/embed/%id%?autoplay=1'
+                }, vimeo: {
+                    index: 'vimeo.com/',
+                    id   : '/',
+                    src  : '//player.vimeo.com/video/%id%?autoplay=1'
+                }, gmaps: {
+                    index: '//maps.google.',
+                    src  : '%id%&output=embed'
+                }
+            }
+        },
+        preloader          : true,
+        showCloseBtn       : true,
+        closeBtnInside     : false,
+        closeOnContentClick: true,
+        closeOnBgClick     : true,
+        enableEscapeKey    : true,
+        modal              : false,
+        alignTop           : false,
+        mainClass          : 'mfp-img-mobile mfp-fade',
+        zoom               : {
+            enabled : true,
+            duration: 300,
+            easing  : 'ease-in-out'
+        },
+        removalDelay       : 200
+    });
+</script>

Modified: XoopsModules/pedigree/trunk/pedigree/header.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/header.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/header.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -23,8 +23,17 @@
 
 xoops_loadLanguage('main', basename(dirname(__DIR__)));
 
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+    include_once(XOOPS_ROOT_PATH . "/class/template.php");
+    $xoopsTpl = new XoopsTpl();
+}
+//$xoops = Xoops::getInstance();
+//$xoopsTpl = $xoops->tpl();
 
 
+$xoopsTpl->assign('mod_url', PEDIGREE_URL); //<{$mod_url}>
+
+
 // uncomment the below line only if you are using Protector 3.x module
 // and you trust your users when uploading files, it is recommended to not allow anonymous uploads if you do so!!
 //define('PROTECTOR_SKIP_FILESCHECKER', true);

Modified: XoopsModules/pedigree/trunk/pedigree/include/class_field.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/include/class_field.php	2014-11-22 06:06:12 UTC (rev 12864)
+++ XoopsModules/pedigree/trunk/pedigree/include/class_field.php	2014-11-22 07:03:35 UTC (rev 12865)
@@ -251,7 +251,7 @@
      */
     function lookup($fieldnumber)
     {
-     $ret = array();
+        $ret = array();
         global $xoopsDB;
         $SQL    = "SELECT * from " . $xoopsDB->prefix("pedigree_lookup" . $fieldnumber) . " ORDER BY 'order'";
         $result = $xoopsDB->query($SQL);
@@ -480,7 +480,7 @@
      */
     function showField()
     {
-        $choosenvalue = '';
+        $choosenvalue   = '';
         $lookupcontents = Field::lookup($this->fieldnumber);
         for ($i = 0; $i < count($lookupcontents); ++$i) {
             if ($lookupcontents[$i]['id'] == $this->value) {
@@ -491,9 +491,12 @@
         return $this->fieldname . " : " . $choosenvalue;
     }
 
+    /**
+     * @return string
+     */
     function showValue()
     {
-        $choosenvalue = '';
+        $choosenvalue   = '';
         $lookupcontents = Field::lookup($this->fieldnumber);
         for ($i = 0; $i < count($lookupcontents); ++$i) {
             if ($lookupcontents[$i]['id'] == $this->value) {
@@ -839,7 +842,7 @@
      */
     function viewField()
     {
-        $view = new XoopsFormLabel($this->fieldname, "<img src=\"images/thumbnails/" ...
 
[truncated message content]