|
From: <be...@us...> - 2013-05-11 08:37:21
|
Revision: 11526
http://sourceforge.net/p/xoops/svn/11526
Author: beckmi
Date: 2013-05-11 08:37:16 +0000 (Sat, 11 May 2013)
Log Message:
-----------
fixing sub-menus names to come language files
Modified Paths:
--------------
XoopsModules/pedigree/trunk/pedigree/add_dog.php
XoopsModules/pedigree/trunk/pedigree/add_litter.php
XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt
XoopsModules/pedigree/trunk/pedigree/language/english/modinfo.php
XoopsModules/pedigree/trunk/pedigree/language/french/modinfo.php
XoopsModules/pedigree/trunk/pedigree/language/nederlands/modinfo.php
XoopsModules/pedigree/trunk/pedigree/seldog.php
XoopsModules/pedigree/trunk/pedigree/tools.php
XoopsModules/pedigree/trunk/pedigree/topstud.php
XoopsModules/pedigree/trunk/pedigree/virtual.php
XoopsModules/pedigree/trunk/pedigree/xoops_version.php
Modified: XoopsModules/pedigree/trunk/pedigree/add_dog.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/add_dog.php 2013-05-10 14:49:13 UTC (rev 11525)
+++ XoopsModules/pedigree/trunk/pedigree/add_dog.php 2013-05-11 08:37:16 UTC (rev 11526)
@@ -1,664 +1,673 @@
-<?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");
-require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
-
-$xoopsOption['template_main'] = "pedigree_adddog.html";
-
-include XOOPS_ROOT_PATH.'/header.php';
-$xoopsTpl->assign('page_title', "Pedigree database - Update details");
-
-//check for access
-$xoopsModule =& XoopsModule::getByDirname("pedigree");
-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 ($f == "checkname") { checkname(); }
-if ($f == "sire") { sire(); }
-if ($f == "dam") { dam(); }
-if ($f == "check") { check(); }
-
-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'));
-
- //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());
- }
-}
-
-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'));
-
- //check for access
- if (empty($xoopsUser))
- {
- redirect_header("javascript:history.go(-1)", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
- exit();
- }
- $user = $_POST['user'];
- if (empty($random)) { $random=$_POST['random']; }
- if (isset($_GET['random'])) { $random = $_GET['random']; }
- if (empty($st)) { $st=0; }
- if (isset($_GET['st'])) { $st=$_GET['st']; }
- $name = $_POST['NAAM'];
- $roft = $_POST['roft'];
-
- $id_eigenaar = $_POST['id_eigenaar'];
- $id_fokker = $_POST['id_fokker'];
-
- $picturefield = $_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> ";
- }
- else
- {
- $pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a> ";
- }
- }
- $pages .="- ";
- $pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=\xC5\">\xC5</a> ";
- $pages .= "<a href=\"add_dog.php?f=sire&r=1&random=".$random."&l=\xD6\">\xD6</a> ";
- //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>  ";
- }
- }
- //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> "; }
- else
- { $pages .= $x."  "; }
- }
- //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>  ";
- }
- }
-
- //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 = 1; $i < ($numofcolumns); $i++)
- {
- $empty[] = array ('value' => "");
- }
- $dogs [] = array ('id' => "0", 'name' => "", 'gender' => "", 'link' => "<a href=\"add_dog.php?f=dam&random=".$random."&selsire=0\">".strtr(_MA_PEDIGREE_ADD_SIREUNKNOWN, array( '[father]' => $moduleConfig['father'] ))."</a>", 'colour' => "", '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);
-
-
-}
-
-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'));
-
- //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=$_POST['random']; }
- 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> ";
- }
- else
- {
- $pages .= "<a href=\"add_dog.php?f=dam&r=1&random=".$random."&l=".chr($i)."\">".chr($i)."</a> ";
- }
- }
- $pages .="- ";
- $pages .= "<a href=\"add_dog.php?f=dam&r=1&random=".$random."&l=\xC5\">\xC5</a> ";
- $pages .= "<a href=\"add_dog.php?f=dam&r=1&random=".$random."&l=\xD6\">\xD6</a> ";
- $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>  "; }
- }
- //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> "; }
- else
- { $pages .= $x."  "; }
- }
- //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> "; }
- }
-
- //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);
-
- 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);
-}
-
-function check()
-{
- 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'));
-
- //check for access
- $xoopsModule =& XoopsModule::getByDirname("pedigree");
- if (empty($xoopsUser))
- {
- redirect_header("index.php", 3, _NOPERM."<br />"._MA_PEDIGREE_REGIST);
- exit();
- }
- if (empty($random)) { $random=$_POST['random']; }
- if (isset($_GET['random'])) { $random = $_GET['random']; }
-
-
- //query
- $queryString = "SELECT * from ".$xoopsDB->prefix("mod_pedigree_temp")." WHERE ID = ".$random;
- $result = $xoopsDB->query($queryString);
- while ($row = $xoopsDB->fetchArray($result))
- {
- //create animal object
- $animal = new Animal( );
- //test to find out how many user fields there are..
- $fields = $animal->numoffields();
- sort($fields);
- $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())
- {
- $usersql .= ",'".addslashes($row['user'.$fields[$i]])."'";
- }
- else
- {
- $usersql .= ",'".$fieldobject->defaultvalue."'";
- }
- //echo $fields[$i]."<br/>";
- }
- //insert into stamboom
- $query = "INSERT INTO ".$xoopsDB->prefix("mod_pedigree_tree")." VALUES ('','".addslashes($row['NAAM'])."','".$row['id_eigenaar']."','".$row['id_fokker']."','".$row['user']."','".$row['roft']."','".$_GET['seldam']."','".$row['vader']."','".addslashes($row['foto'])."',''".$usersql.")";
- mysql_query($query);
- //echo $query; die();
- }
- $sqlquery = "DELETE from ".$xoopsDB->prefix("mod_pedigree_temp")." where ID='".$random."'";
- $xoopsDB->queryf($sqlquery);
- redirect_header("latest.php",1,strtr(_MA_PEDIGREE_ADD_OK, array( '[animalType]' => $moduleConfig['animalType'] )));
-}
-
-//footer
-include XOOPS_ROOT_PATH."/footer.php";
-
+<?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");
+require_once(XOOPS_ROOT_PATH ."/modules/" . $xoopsModule->dirname() . "/include/class_field.php");
+
+$xoopsOption['template_main'] = "pedigree_adddog.html";
+
+include XOOPS_ROOT_PATH.'/header.php';
+$xoopsTpl->assign('page_title', "Pedigree database - Update details");
+
+//check for access
+$xoopsModule =& XoopsModule::getByDirname("pedigree");
+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 ($f == "checkname") { checkname(); }
+if ($f == "sire") { sire(); }
+if ($f == "dam") { dam(); }
+if ($f == "check") { check(); }
+
+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'));
+
+ //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.p...
[truncated message content] |
|
From: <be...@us...> - 2013-05-15 20:53:33
|
Revision: 11548
http://sourceforge.net/p/xoops/svn/11548
Author: beckmi
Date: 2013-05-15 20:53:29 +0000 (Wed, 15 May 2013)
Log Message:
-----------
removing wrong images
Modified Paths:
--------------
XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt
XoopsModules/pedigree/trunk/pedigree/xoops_version.php
Removed Paths:
-------------
XoopsModules/pedigree/trunk/pedigree/images/flags/Thumbs.db
XoopsModules/pedigree/trunk/pedigree/images/img51338bcf8e12e.jpg
XoopsModules/pedigree/trunk/pedigree/images/img51338c74eb450.jpg
XoopsModules/pedigree/trunk/pedigree/images/img51354088ea143.jpg
XoopsModules/pedigree/trunk/pedigree/images/img513540d3c46a3.jpg
XoopsModules/pedigree/trunk/pedigree/images/img5135442cd3294.jpg
XoopsModules/pedigree/trunk/pedigree/images/img51354459cd13a.jpg
XoopsModules/pedigree/trunk/pedigree/images/img51354550a227b.jpg
XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51338c74eb450.jpg_150.jpeg
XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51338c74eb450.jpg_400.jpeg
XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img5135442cd3294.jpg_150.jpeg
XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img5135442cd3294.jpg_400.jpeg
XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51354459cd13a.jpg_150.jpeg
XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51354459cd13a.jpg_400.jpeg
Modified: XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt 2013-05-15 20:47:32 UTC (rev 11547)
+++ XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt 2013-05-15 20:53:29 UTC (rev 11548)
@@ -2,6 +2,11 @@
1.31 Alpha 1 2013-04-12
---------------------------------------
+
+---------------------------------------
+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)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/flags/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/img51338bcf8e12e.jpg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/img51338c74eb450.jpg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/img51354088ea143.jpg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/img513540d3c46a3.jpg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/img5135442cd3294.jpg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/img51354459cd13a.jpg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/img51354550a227b.jpg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51338c74eb450.jpg_150.jpeg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51338c74eb450.jpg_400.jpeg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img5135442cd3294.jpg_150.jpeg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img5135442cd3294.jpg_400.jpeg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51354459cd13a.jpg_150.jpeg
===================================================================
(Binary files differ)
Deleted: XoopsModules/pedigree/trunk/pedigree/images/thumbnails/img51354459cd13a.jpg_400.jpeg
===================================================================
(Binary files differ)
Modified: XoopsModules/pedigree/trunk/pedigree/xoops_version.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/xoops_version.php 2013-05-15 20:47:32 UTC (rev 11547)
+++ XoopsModules/pedigree/trunk/pedigree/xoops_version.php 2013-05-15 20:53:29 UTC (rev 11548)
@@ -54,9 +54,9 @@
$modversion['release_date'] = '2013/02/02';
$modversion["module_website_url"] = "www.xoops.org";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Alpha 1";
+$modversion["module_status"] = "Alpha 2";
$modversion['min_php'] = '5.2';
-$modversion['min_xoops'] = "2.5.5";
+$modversion['min_xoops'] = "2.5.6";
$modversion['min_admin'] = '1.1';
$modversion['min_db'] = array(
'mysql' => '5.0.7',
|
|
From: <be...@us...> - 2013-05-22 03:19:51
|
Revision: 11571
http://sourceforge.net/p/xoops/svn/11571
Author: beckmi
Date: 2013-05-22 03:19:44 +0000 (Wed, 22 May 2013)
Log Message:
-----------
- fixed wrong table names in handlers (luwie/mamba)
Modified Paths:
--------------
XoopsModules/pedigree/trunk/pedigree/admin/admin_header.php
XoopsModules/pedigree/trunk/pedigree/admin/stamboom.php
XoopsModules/pedigree/trunk/pedigree/class/fields.php
XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt
XoopsModules/pedigree/trunk/pedigree/dog.php
XoopsModules/pedigree/trunk/pedigree/include/functions.php
Modified: XoopsModules/pedigree/trunk/pedigree/admin/admin_header.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/admin_header.php 2013-05-21 21:00:18 UTC (rev 11570)
+++ XoopsModules/pedigree/trunk/pedigree/admin/admin_header.php 2013-05-22 03:19:44 UTC (rev 11571)
@@ -59,8 +59,8 @@
$stamboom_trashHandler =& xoops_getModuleHandler('trash', $thisDirname);
$eigenaarHandler =& xoops_getModuleHandler('owner', $thisDirname);
$stamboom_tempHandler =& xoops_getModuleHandler('temp', $thisDirname);
-$stamboomHandler =& xoops_getModuleHandler('fields', $thisDirname);
-$stamboom_configHandler =& xoops_getModuleHandler('tree', $thisDirname);
+$stamboomHandler =& xoops_getModuleHandler('tree', $thisDirname);
+$stamboom_configHandler =& xoops_getModuleHandler('fields', $thisDirname);
$myts =& MyTextSanitizer::getInstance();
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
Modified: XoopsModules/pedigree/trunk/pedigree/admin/stamboom.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/admin/stamboom.php 2013-05-21 21:00:18 UTC (rev 11570)
+++ XoopsModules/pedigree/trunk/pedigree/admin/stamboom.php 2013-05-22 03:19:44 UTC (rev 11571)
@@ -29,7 +29,7 @@
default:
echo $adminMenu->addNavigation('stamboom.php');
$adminMenu->addItemButton(_AM_PEDIGREE_NEWSTAMBOOM, 'stamboom.php?op=new_stamboom', 'add');
- echo $adminMenu->renderButton();
+ echo $adminMenu->renderButton('left');
$criteria = new CriteriaCompo();
$criteria->setSort("ID");
$criteria->setOrder("ASC");
Modified: XoopsModules/pedigree/trunk/pedigree/class/fields.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/class/fields.php 2013-05-21 21:00:18 UTC (rev 11570)
+++ XoopsModules/pedigree/trunk/pedigree/class/fields.php 2013-05-22 03:19:44 UTC (rev 11571)
@@ -53,7 +53,7 @@
function getForm($action = false)
{
- global $xoopsDB, $xoopsModuleConfig;
+ global $xoopsDB, $xoopsModuleConfig, $xoopsModule;
if ($action === false) {
$action = $_SERVER["REQUEST_URI"];
@@ -102,7 +102,8 @@
include_once(XOOPS_ROOT_PATH . "/class/tree.php");
// $Handler =& xoops_getModuleHandler("animal_", $xoopsModule->getVar("dirname"));
- $Handler =& xoops_getModuleHandler('pedigree_fields', $xoopsModule->getVar("dirname"));
+ $Handler =& xoops_getModuleHandler('fields', $xoopsModule->getVar("dirname"));
+// $Handler = & $stamboom_configHandler;
$criteria = new CriteriaCompo();
$criteria->setSort('_id');
$criteria->setOrder('ASC');
Modified: XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt 2013-05-21 21:00:18 UTC (rev 11570)
+++ XoopsModules/pedigree/trunk/pedigree/docs/changelog.txt 2013-05-22 03:19:44 UTC (rev 11571)
@@ -1,8 +1,10 @@
---------------------------------------
-1.31 Alpha 1 2013-04-12
+1.31 Alpha 2 2013-05-21
---------------------------------------
+- fixed wrong table names in handlers (luwie/mamba)
+
---------------------------------------
1.31 Alpha 1 2013-04-12
---------------------------------------
Modified: XoopsModules/pedigree/trunk/pedigree/dog.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/dog.php 2013-05-21 21:00:18 UTC (rev 11570)
+++ XoopsModules/pedigree/trunk/pedigree/dog.php 2013-05-22 03:19:44 UTC (rev 11571)
@@ -40,7 +40,7 @@
echo "No dog has been selected"; die();
}
-if($_GET['delpicture'] == 'true')
+if(isset($_GET['delpicture']) && $_GET['delpicture'] == 'true')
{
$delpicsql = "UPDATE ".$xoopsDB->prefix("mod_pedigree_tree")." SET foto = '' WHERE ID = '".$id."'";
mysql_query($delpicsql);
Modified: XoopsModules/pedigree/trunk/pedigree/include/functions.php
===================================================================
--- XoopsModules/pedigree/trunk/pedigree/include/functions.php 2013-05-21 21:00:18 UTC (rev 11570)
+++ XoopsModules/pedigree/trunk/pedigree/include/functions.php 2013-05-22 03:19:44 UTC (rev 11571)
@@ -55,6 +55,7 @@
function uploadedpict( $num )
{
+ global $xoopsModule;
$max_imgsize = 1024000;
$max_imgwidth = 1500;
$max_imgheight = 1000;
|
|
From: <be...@us...> - 2014-11-22 07:03:40
|
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> <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> <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
==============================...
[truncated message content] |