diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-09-25 17:51:17 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-09-25 17:51:17 +0000 |
| commit | c3c1e07595f0efb20d13c858d96810dc7ed295ad (patch) | |
| tree | b6c6330247155f7a710de57688f2c0317e5ff8cf | |
| parent | d21816f2daafe39344144db334b4884fc8e838d8 (diff) | |
| download | webtrees-c3c1e07595f0efb20d13c858d96810dc7ed295ad.tar.gz webtrees-c3c1e07595f0efb20d13c858d96810dc7ed295ad.tar.bz2 webtrees-c3c1e07595f0efb20d13c858d96810dc7ed295ad.zip | |
57 files changed, 1381 insertions, 1440 deletions
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php index a8cf6d2b9f..1cb82cd093 100644 --- a/includes/functions/functions_import.php +++ b/includes/functions/functions_import.php @@ -1129,7 +1129,7 @@ function update_media($gid, $ged_id, $gedrec, $update = false) { $objlevel = 0; $inobj = false; } - } else { + } else { $newrec = $gedrec; } @@ -1193,7 +1193,7 @@ function accept_all_changes($xref, $ged_id) { WT_DB::prepare( "UPDATE `##change`". " SET status='accepted'". - " WHERE status='pending' AND xref=? AND gedcom_id=?" + " WHERE status='pending' AND xref=? AND gedcom_id=?" )->execute(array($xref, $ged_id)); AddToLog("Accepted change {$change->change_id} for {$xref} / {$change->gedcom_name} into database", 'edit'); } diff --git a/js/jw_player/flvVideo.php b/js/jw_player/flvVideo.php index ef880e2073..814035f6f4 100644 --- a/js/jw_player/flvVideo.php +++ b/js/jw_player/flvVideo.php @@ -49,7 +49,7 @@ $preview=""; ?>
<!-- START OF THE PLAYER EMBEDDING TO COPY-PASTE -->
- <!--
+ <!--
<object id="player" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" name="player" width="400" height="315">
<param name="movie" value="player.swf" />
<param name="allowfullscreen" value="true" />
@@ -73,7 +73,7 @@ $preview=""; <div id="container"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this player.</div>
<script type="text/javascript">
- var video = "<?php print $flvVideo; ?>";
+ var video = "<?php print $flvVideo; ?>";
var preview = "<?php print $preview; ?>";
var s1 = new SWFObject("player.swf","ply","480","365","9","#000000");
s1.addParam("allowfullscreen","true");
@@ -87,5 +87,4 @@ $preview=""; </center>
</body>
-
</html>
diff --git a/modules/GEDFact_assistant/MEDIA_ctrl.php b/modules/GEDFact_assistant/MEDIA_ctrl.php index 7924c44fdd..f85d9dff4d 100644 --- a/modules/GEDFact_assistant/MEDIA_ctrl.php +++ b/modules/GEDFact_assistant/MEDIA_ctrl.php @@ -32,7 +32,7 @@ require_once WT_ROOT.'includes/controllers/individual_ctrl.php'; $controller = new IndividualController(); $controller->init(); -echo "<link href =\"modules/GEDFact_assistant/css/gf_styles.css\" rel=\"stylesheet\" type=\"text/css\" media=\"screen\" />"; +echo "<link href =\"modules/GEDFact_assistant/css/gf_styles.css\" rel=\"stylesheet\" type=\"text/css\" media=\"screen\" />"; global $USE_THUMBS_MAIN, $tabno; global $linkToID; @@ -50,13 +50,12 @@ global $SEARCH_SPIDER, $GOOGLEMAP_PH_CONTROLS; // If alive display age $bdate=$controller->indi->getBirthDate(); $age = GedcomDate::GetAgeGedcom($bdate); - // if ($age!="") { - // $summary.= "<span class=\"label\">".i18n::translate('Age').":</span><span class=\"field\"> ".get_age_at_event($age, true)."</span>"; - // } + //if ($age!="") { + //$summary.= "<span class=\"label\">".i18n::translate('Age').":</span><span class=\"field\"> ".get_age_at_event($age, true)."</span>"; + //} } $summary.=$controller->indi->format_first_major_fact(WT_EVENTS_DEAT, 2); $controller->medialink_assistant(); // print_footer(); -?> diff --git a/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php b/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php index 5073b6d802..075fe22bfe 100644 --- a/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php +++ b/modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php @@ -56,8 +56,8 @@ if (isset($_REQUEST['REPO'])) $REPO = $_REQUEST['REPO']; if (isset($_REQUEST['CALN'])) $CALN = $_REQUEST['CALN']; - if (isset($_REQUEST['pid_array'])) $pid_array = $_REQUEST['pid_array']; - if (isset($_REQUEST['pid'])) $pid = $_REQUEST['pid']; + if (isset($_REQUEST['pid_array'])) $pid_array = $_REQUEST['pid_array']; + if (isset($_REQUEST['pid'])) $pid = $_REQUEST['pid']; global $pid; @@ -106,7 +106,7 @@ $xref="none"; echo "<br /><br /><br />"; echo "<div class=indent> No individuals entered, close and try again </div>"; - echo "<br /><br /><br />"; + echo "<br /><br /><br />"; } if ($xref != "none") { @@ -123,24 +123,20 @@ if (parent.opener.document.getElementById("pids_array_edit") == null || parent.opener.document.getElementById("pids_array_edit") == 'undefined') { //alert ("EDIT NOT HERE"); } else { - // alert("WE ARE EDITING an EVENT"); - // alert(parent.opener.document.editform.pids_array_edit.value); + //alert("WE ARE EDITING an EVENT"); + //alert(parent.opener.document.editform.pids_array_edit.value); parent.opener.document.editform.pids_array_edit.value="<?php echo $pid_array; ?>"; - // alert(parent.opener.document.editform.pids_array_edit.value); + //alert(parent.opener.document.editform.pids_array_edit.value); } if (parent.opener.document.getElementById("pids_array_add") == null || parent.opener.document.getElementById("pids_array_add") == 'undefined') { //alert ("ADD NOT HERE"); } else { - // alert("WE ARE ADDING an EVENT"); - // alert(parent.opener.document.addform.pids_array_add.value); + //alert("WE ARE ADDING an EVENT"); + //alert(parent.opener.document.addform.pids_array_add.value); parent.opener.document.addform.pids_array_add.value="<?php echo $pid_array; ?>"; - // alert(parent.opener.document.addform.pids_array_add.value); + //alert(parent.opener.document.addform.pids_array_add.value); } </script> <?php - echo "<br /><br /><br /><br />"; } - - -?> diff --git a/modules/GEDFact_assistant/_CENS/census_1_ctrl.php b/modules/GEDFact_assistant/_CENS/census_1_ctrl.php index b8c6d546e5..98222b53f0 100644 --- a/modules/GEDFact_assistant/_CENS/census_1_ctrl.php +++ b/modules/GEDFact_assistant/_CENS/census_1_ctrl.php @@ -107,7 +107,7 @@ $currpid=$pid; <div class="cens_textinput_right"> <?php echo i18n::translate('Add'); ?><br> <input type="radio" name="totallyrad" value="0" checked="checked" /> - </div> + </div> <?php //-- Census Add Rows Area ========================================================= @@ -125,4 +125,3 @@ $currpid=$pid; <script language="JavaScript" type="text/javascript"> window.onLoad = initDynamicOptionLists(); </script> - diff --git a/modules/GEDFact_assistant/_CENS/census_2_source_input.php b/modules/GEDFact_assistant/_CENS/census_2_source_input.php index c12f809929..2b1a04be40 100644 --- a/modules/GEDFact_assistant/_CENS/census_2_source_input.php +++ b/modules/GEDFact_assistant/_CENS/census_2_source_input.php @@ -245,10 +245,10 @@ global $TEXT_DIRECTION; var dob = (tr.cells[11].childNodes[0].value); // DOB Birth date in Julian Format var yrsmarr = (tr.cells[16].childNodes[0].value); // Years married var agemarr = (tr.cells[20].childNodes[0].value); // Age at 1st marriage - var dom = (tr.cells[69].childNodes[0].value); // DOM Marriage date in Julian format - var fullnam = (tr.cells[70].childNodes[0].value); // Full Name - var marrnam = (tr.cells[71].childNodes[0].value); // Married Name - var dod = (tr.cells[72].childNodes[0].value); // DOD Death date in Julian format + var dom = (tr.cells[69].childNodes[0].value); // DOM Marriage date in Julian format + var fullnam = (tr.cells[70].childNodes[0].value); // Full Name + var marrnam = (tr.cells[71].childNodes[0].value); // Married Name + var dod = (tr.cells[72].childNodes[0].value); // DOD Death date in Julian format var one_day = 1000*60*60*24; var one_month = (365.26*one_day)/12; @@ -339,7 +339,7 @@ global $TEXT_DIRECTION; tr.cells[2].childNodes[0].value = fullnam; } - var age = (tr.cells[7].childNodes[0].value); // Age + var age = (tr.cells[7].childNodes[0].value); // Age } } @@ -387,19 +387,19 @@ global $TEXT_DIRECTION; } var BORN = ALIVE+DEAD; if (BORN == 0) { - tr.cells[17].childNodes[0].value = "-"; // BORN - tr.cells[18].childNodes[0].value = "-"; // ALIVE - tr.cells[19].childNodes[0].value = "-"; // DEAD + tr.cells[17].childNodes[0].value = "-"; // BORN + tr.cells[18].childNodes[0].value = "-"; // ALIVE + tr.cells[19].childNodes[0].value = "-"; // DEAD } else { - tr.cells[17].childNodes[0].value = BORN; // BORN - tr.cells[18].childNodes[0].value = ALIVE; // ALIVE - tr.cells[19].childNodes[0].value = DEAD; // DEAD + tr.cells[17].childNodes[0].value = BORN; // BORN + tr.cells[18].childNodes[0].value = ALIVE; // ALIVE + tr.cells[19].childNodes[0].value = DEAD; // DEAD } if (ALIVE == 0) { - tr.cells[18].childNodes[0].value = "-"; // ALIVE + tr.cells[18].childNodes[0].value = "-"; // ALIVE } if (DEAD == 0) { - tr.cells[19].childNodes[0].value = "-"; // DEAD + tr.cells[19].childNodes[0].value = "-"; // DEAD } } } @@ -429,7 +429,7 @@ global $TEXT_DIRECTION; var tr = tbl.rows[i]; for(var j=2; j<tr.cells.length; j++){ if (j!=7 && j!=12) { - // miss out all cols except age cols + // miss out all cols except age cols continue; }else if (tr.cells[j].childNodes[0].value=="") { tr.cells[j].childNodes[0].value=null @@ -452,7 +452,7 @@ global $TEXT_DIRECTION; bage = (I+', '+J+', '+K); } // Calculate Death Year ======================================= - var dage = (tr.cells[72].childNodes[0].value); + var dage = (tr.cells[72].childNodes[0].value); // If valid Julian date used, then use this instead ----------- if (dage>1721060) { var IJD = Math.floor(dage); @@ -776,11 +776,11 @@ global $TEXT_DIRECTION; flip_16 = ""; flip_17 = ""; flip_18 = ""; - // flip_22 = ""; + //flip_22 = ""; flip_27 = ""; flip_28 = ""; flip_29 = ""; - // flip_30 = ""; + //flip_30 = ""; flip_31 = ""; flip_32 = ""; flip_34 = ""; @@ -804,7 +804,7 @@ global $TEXT_DIRECTION; flip_16 = ""; flip_17 = ""; flip_18 = ""; - // flip_22 = ""; + //flip_22 = ""; flip_27 = ""; flip_28 = ""; flip_29 = ""; @@ -821,13 +821,13 @@ global $TEXT_DIRECTION; flip_3 = ""; flip_8 = ""; flip_9 = ""; - // flip_11 = ""; + //flip_11 = ""; flip_12 = ""; flip_15 = ""; flip_16 = ""; flip_17 = ""; flip_18 = ""; - // flip_22 = ""; + //flip_22 = ""; flip_27 = ""; flip_28 = ""; flip_29 = ""; @@ -850,7 +850,7 @@ global $TEXT_DIRECTION; flip_16 = ""; flip_35 = ""; flip_36 = ""; - // flip_42 = ""; + //flip_42 = ""; flip_45 = ""; flip_47= ""; flip_48 = ""; @@ -952,7 +952,7 @@ global $TEXT_DIRECTION; cols_65[i].style.display = flip_65; cols_66[i].style.display = flip_66; cols_67[i].style.display = flip_67; - // cols_68[i].style.display = flip_68; + //cols_68[i].style.display = flip_68; } } @@ -1017,7 +1017,7 @@ global $TEXT_DIRECTION; <div class="cens_sour_year"> <span><?php echo i18n::translate('Year'); ?><br /></span> <select style = "background:#ffaaaa;"; - onchange = "if( this.options[this.selectedIndex].value!='') { + onchange = "if( this.options[this.selectedIndex].value!='') { changeYear(this.options[this.selectedIndex].value); }" id="censYear" name="censYear"> @@ -1046,4 +1046,3 @@ global $TEXT_DIRECTION; </div> </div> </div> - diff --git a/modules/GEDFact_assistant/_CENS/census_3_find.php b/modules/GEDFact_assistant/_CENS/census_3_find.php index a7d420cbbc..0828e622bc 100644 --- a/modules/GEDFact_assistant/_CENS/census_3_find.php +++ b/modules/GEDFact_assistant/_CENS/census_3_find.php @@ -42,7 +42,7 @@ $directory =safe_GET('directory', WT_REGEX_NOSCRIPT, $MEDIA_DIRECTORY); $multiple =safe_GET_bool('multiple'); $showthumb =safe_GET_bool('showthumb'); $all =safe_GET_bool('all'); -$subclick =safe_GET('subclick'); +$subclick =safe_GET('subclick'); $choose =safe_GET('choose', WT_REGEX_NOSCRIPT, '0all'); $level =safe_GET('level', WT_REGEX_INTEGER, 0); $language_filter=safe_GET('language_filter'); @@ -443,14 +443,14 @@ if ($action=="filter") { $nam = $indi->getAllNames(); $wholename = rtrim($nam[0]['givn'],'*')." ".$nam[0]['surname']; $fulln = rtrim($nam[0]['givn'],'*')." ".$nam[0]['surname']; - $fulln = str_replace('"', '\'', $fulln); // Replace double quotes + $fulln = str_replace('"', '\'', $fulln); // Replace double quotes $fulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $fulln); $fulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $fulln); $givn = rtrim($nam[0]['givn'],'*'); $surn = $nam[0]['surname']; if (isset($nam[1])) { $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; - $fulmn = str_replace('"', '\'', $fulmn); // Replace double quotes + $fulmn = str_replace('"', '\'', $fulmn); // Replace double quotes $fulmn = str_replace("@N.N.", "(".i18n::translate('unknown').")", $fulmn); $fulmn = str_replace("@P.N.", "(".i18n::translate('unknown').")", $fulmn); $marn = $nam[1]['surname']; @@ -490,12 +490,12 @@ if ($action=="filter") { foreach ($children as $key=>$child) { $chnam = $child->getAllNames(); $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; - $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here + $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name - $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name + $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) if (!isset($chdob)) { $chdob = ""; } - $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) if (!isset($chdod)) { $chdod = ""; } $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); @@ -512,24 +512,24 @@ if ($action=="filter") { // NOTES = is equivalent to= function pasterow(id, nam, mnam, label, gend, cond, dom, dob, age, dod, occu, birthpl, fbirthpl, mbirthpl, chilBLD) { // ============================================================================================================================== echo "<a href=\"javascript:;\" onclick=\"window.opener.insertRowToTable("; - echo "'".$indi->getXref()."', "; // id - Indi Id - echo "'".addslashes(strip_tags($fulln))."', "; // nam - Name - echo "'".addslashes(strip_tags($fulmn))."', "; // mnam - Married Name - echo "'-', "; // label - Relation to Head of Household - echo "'".$indi->getSex()."', "; // gend - Sex - echo "'S', "; // cond - Marital Condition - echo "'".$marrdate."', "; // dom - Date of Marriage - echo "'".(($indi->getBirthDate()->minJD() + $indi->getBirthDate()->maxJD())/2)."' ,"; // dob - Date of Birth - echo "'".(1901-$indi->getbirthyear())."' ,"; // ~age~ - Census Date minus YOB (Preliminary) - echo "'".(($indi->getDeathDate()->minJD() + $indi->getDeathDate()->maxJD())/2)."' ,"; // dod - Date of Death - echo "'', "; // occu - Occupation - echo "'".$indi->getbirthplace()."', "; // birthpl - Birthplace - echo "'".$FBP."', "; // fbirthpl - Father's Birthplace - echo "'".$MBP."', "; // mbirthpl - Mother's Birthplace - echo "'".$chBLDarray."'"; // chilBLD - Array of Children (name, birthdate, deathdate) + echo "'".$indi->getXref()."', "; // id - Indi Id + echo "'".addslashes(strip_tags($fulln))."', "; // nam - Name + echo "'".addslashes(strip_tags($fulmn))."', "; // mnam - Married Name + echo "'-', "; // label - Relation to Head of Household + echo "'".$indi->getSex()."', "; // gend - Sex + echo "'S', "; // cond - Marital Condition + echo "'".$marrdate."', "; // dom - Date of Marriage + echo "'".(($indi->getBirthDate()->minJD() + $indi->getBirthDate()->maxJD())/2)."' ,"; // dob - Date of Birth + echo "'".(1901-$indi->getbirthyear())."' ,"; // ~age~ - Census Date minus YOB (Preliminary) + echo "'".(($indi->getDeathDate()->minJD() + $indi->getDeathDate()->maxJD())/2)."' ,"; // dod - Date of Death + echo "'', "; // occu - Occupation + echo "'".$indi->getbirthplace()."', "; // birthpl - Birthplace + echo "'".$FBP."', "; // fbirthpl - Father's Birthplace + echo "'".$MBP."', "; // mbirthpl - Mother's Birthplace + echo "'".$chBLDarray."'"; // chilBLD - Array of Children (name, birthdate, deathdate) echo ");"; echo "return false;\">"; - echo "<b>".$indi->getFullName()."</b> "; // Name Link + echo "<b>".$indi->getFullName()."</b> "; // Name Link if ($ABBREVIATE_CHART_LABELS) { $born=abbreviate_fact('BIRT'); @@ -885,5 +885,3 @@ echo "</div>"; // Close div that centers table echo WT_JS_START, 'document.filter', $type, '.filter.focus();', WT_JS_END; print_simple_footer(); - -?> diff --git a/modules/GEDFact_assistant/_CENS/census_3_search_add.php b/modules/GEDFact_assistant/_CENS/census_3_search_add.php index d7112ce500..4ab886db87 100644 --- a/modules/GEDFact_assistant/_CENS/census_3_search_add.php +++ b/modules/GEDFact_assistant/_CENS/census_3_search_add.php @@ -129,9 +129,9 @@ if (!defined('WT_WEBTREES')) { $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = addslashes($chfulln); // Child's Full Name - $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = addslashes($chfulln); // Child's Full Name + $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -193,61 +193,61 @@ if (!defined('WT_WEBTREES')) { if ( ($people["husb"]->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print PrintReady($people["husb"]->getXref()) ; // pid = PID + print PrintReady($people["husb"]->getXref()) ; // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php - print PrintReady($people["husb"]->getLabel()); // label = Relationship + print PrintReady($people["husb"]->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($people["husb"]->getSex()); // gend = Gender + print PrintReady($people["husb"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($people["husb"]->getBirthDate()->minJD()+$people["husb"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($people["husb"]->getBirthDate()->minJD()+$people["husb"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($people["husb"]->getDeathDate()->minJD()+$people["husb"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($people["husb"]->getDeathDate()->minJD()+$people["husb"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["husb"]->getBirthPlace()); // birthpl = Husband Place of Birth + print PrintReady($people["husb"]->getBirthPlace()); // birthpl = Husband Place of Birth ?>", "<?php if (isset($HusbFBP)) { - print PrintReady($HusbFBP); // fbirthpl = Husband Father's Place of Birth + print PrintReady($HusbFBP); // fbirthpl = Husband Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Husband Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Husband Father's Place of Birth Not known } ?>", "<?php if (isset($HusbMBP)) { - print PrintReady($HusbMBP); // mbirthpl = Husband Mother's Place of Birth + print PrintReady($HusbMBP); // mbirthpl = Husband Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Husband Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Husband Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $people["husb"]->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($people["husb"]->getFullName()); // Full Name (Link) + print PrintReady($people["husb"]->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -325,61 +325,61 @@ if (!defined('WT_WEBTREES')) { if ( ($people["wife"]->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print $people["wife"]->getXref() ; // pid = PID + print $people["wife"]->getXref() ; // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php - print PrintReady($people["wife"]->getLabel()); // label = Relationship + print PrintReady($people["wife"]->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($people["wife"]->getSex()); // gend = Gender + print PrintReady($people["wife"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0 && isset($nam[1])){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php echo ($people["wife"]->getBirthDate()->minJD()+$people["wife"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($people["wife"]->getDeathDate()->minJD()+$people["wife"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($people["wife"]->getDeathDate()->minJD()+$people["wife"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["wife"]->getBirthPlace()); // birthpl = Wife Place of Birth + print PrintReady($people["wife"]->getBirthPlace()); // birthpl = Wife Place of Birth ?>", "<?php if (isset($WifeFBP)) { - print PrintReady($WifeFBP); // fbirthpl = Wife Father's Place of Birth + print PrintReady($WifeFBP); // fbirthpl = Wife Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Wife Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Wife Father's Place of Birth Not known } ?>", "<?php if (isset($WifeMBP)) { - print PrintReady($WifeMBP); // mbirthpl = Wife Mother's Place of Birth + print PrintReady($WifeMBP); // mbirthpl = Wife Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Wife Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Wife Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $people["wife"]->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($people["wife"]->getFullName()); // Full Name (Link) + print PrintReady($people["wife"]->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -409,9 +409,9 @@ if (!defined('WT_WEBTREES')) { $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = addslashes($chfulln); // Child's Full Name// Child's Full Name - $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = addslashes($chfulln); // Child's Full Name// Child's Full Name + $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -472,67 +472,67 @@ if (!defined('WT_WEBTREES')) { if ( ($child->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print $child->getXref(); // pid = PID + print $child->getXref(); // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php if ($child->getXref()==$pid) { - print "Head"; // label = Head + print "Head"; // label = Head }else{ - print PrintReady($child->getLabel()); // label = Relationship + print PrintReady($child->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($child->getSex()); // gend = Gender + print PrintReady($child->getSex()); // gend = Gender ?>", "<?php if ($married>0) { - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) } else if ($married<0 || ($married=="0") ) { - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } else { - echo ""; // cond = Condition (Not Known) + echo ""; // cond = Condition (Not Known) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($child->getBirthPlace()); // birthpl = Child Place of Birt + print PrintReady($child->getBirthPlace()); // birthpl = Child Place of Birt ?>", "<?php if (isset($people["husb"])) { - print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth + print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known } ?>", "<?php if (isset($people["wife"])) { - print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth + print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $child->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($child->getFullName()); // Full Name (Link) + print PrintReady($child->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -569,9 +569,9 @@ if (!defined('WT_WEBTREES')) { $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = addslashes($chfulln); // Child's Full Name - $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = addslashes($chfulln); // Child's Full Name + $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -640,65 +640,65 @@ if (!defined('WT_WEBTREES')) { if ( ($people["husb"]->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print PrintReady($people["husb"]->getXref()); // pid = PID + print PrintReady($people["husb"]->getXref()); // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php if ($people["husb"]->getLabel() == ".") { - print PrintReady(i18n::translate('Step-Father')); // label = Relationship + print PrintReady(i18n::translate('Step-Father')); // label = Relationship }else{ - print PrintReady($people["husb"]->getLabel()); // label = Relationship + print PrintReady($people["husb"]->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($people["husb"]->getSex()); // gend = Gender + print PrintReady($people["husb"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($people["husb"]->getBirthDate()->minJD()+$people["husb"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($people["husb"]->getBirthDate()->minJD()+$people["husb"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($people["husb"]->getDeathDate()->minJD()+$people["husb"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($people["husb"]->getDeathDate()->minJD()+$people["husb"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["husb"]->getBirthPlace()); // birthpl = Step Husband Place of Birth + print PrintReady($people["husb"]->getBirthPlace()); // birthpl = Step Husband Place of Birth ?>", "<?php if (isset($HusbFBP)) { - print PrintReady($HusbFBP); // fbirthpl = Step Husband Father's Place of Birth + print PrintReady($HusbFBP); // fbirthpl = Step Husband Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Step Husband Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Step Husband Father's Place of Birth Not known } ?>", "<?php if (isset($HusbMBP)) { - print PrintReady($HusbMBP); // mbirthpl = Step Husband Mother's Place of Birth + print PrintReady($HusbMBP); // mbirthpl = Step Husband Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Step Husband Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Step Husband Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $people["husb"]->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($people["husb"]->getFullName()); // Full Name (Link) + print PrintReady($people["husb"]->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -785,65 +785,65 @@ if (!defined('WT_WEBTREES')) { if ( ($people["wife"]->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print PrintReady($people["wife"]->getXref()) ; // pid = PID + print PrintReady($people["wife"]->getXref()) ; // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php if ($people["wife"]->getLabel() == ".") { - print PrintReady(i18n::translate('Step-Mother')); // label = Relationship + print PrintReady(i18n::translate('Step-Mother')); // label = Relationship }else{ - print PrintReady($people["wife"]->getLabel()); // label = Relationship + print PrintReady($people["wife"]->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($people["wife"]->getSex()); // gend = Gender + print PrintReady($people["wife"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0 && isset($nam[1])){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($people["wife"]->getBirthDate()->minJD()+$people["wife"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($people["wife"]->getBirthDate()->minJD()+$people["wife"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($people["wife"]->getDeathDate()->minJD()+$people["wife"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($people["wife"]->getDeathDate()->minJD()+$people["wife"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["wife"]->getBirthPlace()); // birthpl = Step Wife Place of Birth + print PrintReady($people["wife"]->getBirthPlace()); // birthpl = Step Wife Place of Birth ?>", "<?php if (isset($WifeFBP)) { - print PrintReady($WifeFBP); // fbirthpl = Step Wife Father's Place of Birth + print PrintReady($WifeFBP); // fbirthpl = Step Wife Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Step Wife Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Step Wife Father's Place of Birth Not known } ?>", "<?php if (isset($WifeMBP)) { - print PrintReady($WifeMBP); // mbirthpl = Step Wife Mother's Place of Birth + print PrintReady($WifeMBP); // mbirthpl = Step Wife Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Step Wife Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Step Wife Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $people["wife"]->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($people["wife"]->getFullName()); // Full Name (Link) + print PrintReady($people["wife"]->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -872,9 +872,9 @@ if (!defined('WT_WEBTREES')) { $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = addslashes($chfulln); // Child's Full Name - $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = addslashes($chfulln); // Child's Full Name + $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -919,57 +919,57 @@ if (!defined('WT_WEBTREES')) { if ( ($child->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print PrintReady($child->getXref()) ; // pid = PID + print PrintReady($child->getXref()) ; // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php - print PrintReady($child->getLabel()); // label = Relationship + print PrintReady($child->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($child->getSex()); // gend = Gender + print PrintReady($child->getSex()); // gend = Gender ?>", "<?php - print ""; // cond = Condition (Married or Single) + print ""; // cond = Condition (Married or Single) ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($child->getBirthPlace()); // birthpl = Child Place of Birth + print PrintReady($child->getBirthPlace()); // birthpl = Child Place of Birth ?>", "<?php if (isset($people["husb"])) { - print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth + print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known } ?>", "<?php if (isset($people["wife"])) { - print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth + print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $child->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($child->getFullName()); // Full Name (Link) + print PrintReady($child->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -1008,9 +1008,9 @@ if (!defined('WT_WEBTREES')) { $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = addslashes($chfulln); // Child's Full Name - $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = addslashes($chfulln); // Child's Full Name + $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -1078,65 +1078,65 @@ if (!defined('WT_WEBTREES')) { if ( ($people["husb"]->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print $people["husb"]->getXref() ; // pid = PID + print $people["husb"]->getXref() ; // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php if ($people["husb"]->getXref()==$pid) { - print "Head"; // label = Relationship + print "Head"; // label = Relationship }else{ - print $people["husb"]->getLabel(); // label = Relationship + print $people["husb"]->getLabel(); // label = Relationship } ?>", "<?php - print PrintReady($people["husb"]->getSex()); // gend = Gender + print PrintReady($people["husb"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($people["husb"]->getBirthDate()->minJD()+$people["husb"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($people["husb"]->getBirthDate()->minJD()+$people["husb"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($people["husb"]->getDeathDate()->minJD()+$people["husb"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($people["husb"]->getDeathDate()->minJD()+$people["husb"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["husb"]->getBirthPlace()); // birthpl = Husband Place of Birth + print PrintReady($people["husb"]->getBirthPlace()); // birthpl = Husband Place of Birth ?>", "<?php if (isset($HusbFBP)) { - print PrintReady($HusbFBP); // fbirthpl = Husband Father's Place of Birth + print PrintReady($HusbFBP); // fbirthpl = Husband Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Husband Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Husband Father's Place of Birth Not known } ?>", "<?php if (isset($HusbMBP)) { - print PrintReady($HusbMBP); // mbirthpl = Husband Mother's Place of Birth + print PrintReady($HusbMBP); // mbirthpl = Husband Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Husband Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Husband Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $people["husb"]->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($people["husb"]->getFullName()); // Full Name (Link) + print PrintReady($people["husb"]->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -1225,65 +1225,65 @@ if (!defined('WT_WEBTREES')) { if ( ($people["wife"]->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print $people["wife"]->getXref() ; // pid = PID + print $people["wife"]->getXref() ; // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php if ($people["wife"]->getXref()==$pid) { - print "Head"; // label = Head + print "Head"; // label = Head }else{ - print PrintReady($people["wife"]->getLabel()); // label = Relationship + print PrintReady($people["wife"]->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($people["wife"]->getSex()); // gend = Gender + print PrintReady($people["wife"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0 && isset($nam[1])){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($people["wife"]->getBirthDate()->minJD()+$people["wife"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($people["wife"]->getBirthDate()->minJD()+$people["wife"]->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($people["wife"]->getDeathDate()->minJD()+$people["wife"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($people["wife"]->getDeathDate()->minJD()+$people["wife"]->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["wife"]->getBirthPlace()); // birthpl = Wife Place of Birth + print PrintReady($people["wife"]->getBirthPlace()); // birthpl = Wife Place of Birth ?>", "<?php if (isset($WifeFBP)) { - print PrintReady($WifeFBP); // fbirthpl = Wife Father's Place of Birth + print PrintReady($WifeFBP); // fbirthpl = Wife Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Wife Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Wife Father's Place of Birth Not known } ?>", "<?php if (isset($WifeMBP)) { - print PrintReady($WifeMBP); // mbirthpl = Wife Mother's Place of Birth + print PrintReady($WifeMBP); // mbirthpl = Wife Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Wife Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Wife Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $people["wife"]->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($people["wife"]->getFullName()); // Full Name (Link) + print PrintReady($people["wife"]->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -1316,9 +1316,9 @@ if (!defined('WT_WEBTREES')) { $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = addslashes($chfulln); // Child's Full Name// Child's Full Name - $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = addslashes($chfulln); // Child's Full Name// Child's Full Name + $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -1365,63 +1365,63 @@ if (!defined('WT_WEBTREES')) { if ( ($child->canDisplayDetails()) ) { ?> <a href='javaScript:insertRowToTable("<?php - print $child->getXref() ; // pid = PID + print $child->getXref() ; // pid = PID ?>", "<?php - echo addslashes($fulln); // nam = Full Name + echo addslashes($fulln); // nam = Full Name ?>", "<?php if (isset($nam[1])){ - echo addslashes($fulmn); // mnam = Full Married Name + echo addslashes($fulmn); // mnam = Full Married Name }else{ - echo addslashes($fulln); // mnam = Full Name + echo addslashes($fulln); // mnam = Full Name } ?>", "<?php - print PrintReady($child->getLabel()); // label = Relationship + print PrintReady($child->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($child->getSex()); // gend = Gender + print PrintReady($child->getSex()); // gend = Gender ?>", "<?php if ($married>0) { - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) } else if ($married<0 || ($married=="0") ) { - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } else { - echo ""; // cond = Condition (Not Known) + echo ""; // cond = Condition (Not Known) } ?>", "<?php if ($marrdate) { - echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) + echo ($marrdate->minJD()+$marrdate->maxJD())/2; // dom = Date of Marriage (Julian) } ?>", "<?php - echo ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) + echo ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // dob = Date of Birth (Julian) ?>", "<?php - print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - echo ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) + echo ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // dod = Date of Death (Julian) ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($child->getBirthPlace()); // birthpl = Child Place of Birth + print PrintReady($child->getBirthPlace()); // birthpl = Child Place of Birth ?>", "<?php if (isset($people["husb"])) { - print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth + print PrintReady($people["husb"]->getBirthPlace()); // fbirthpl = Child Father's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // fbirthpl = Child Father's Place of Birth Not known } ?>", "<?php if (isset($people["wife"])) { - print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth + print PrintReady($people["wife"]->getBirthPlace()); // mbirthpl = Child Mother's Place of Birth } else { - print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known + print PrintReady('UNK, UNK, UNK, UNK'); // mbirthpl = Child Mother's Place of Birth Not known } ?>", "<?php if (isset($chBLDarray) && $child->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) + echo PrintReady($chBLDarray); // Array of Children (name, birthdate, deathdate) } else { echo PrintReady(''); } ?>");'> <?php - print PrintReady($child->getFullName()); // Full Name (Link) + print PrintReady($child->getFullName()); // Full Name (Link) ?> </a> <?php print "\n" ; @@ -1451,10 +1451,10 @@ require_once 'includes/functions/functions_charts.php'; * print the information for an individual chart box * * find and print a given individuals information for a pedigree chart - * @param string $pid the Gedcom Xref ID of the to print - * @param int $style the style to print the box in, 1 for smaller boxes, 2 for larger boxes - * @param boolean $show_famlink set to true to show the icons for the popup links and the zoomboxes - * @param int $count on some charts it is important to keep a count of how many boxes were printed + * @param string $pid the Gedcom Xref ID of the to print + * @param int $style the style to print the box in, 1 for smaller boxes, 2 for larger boxes + * @param boolean $show_famlink set to true to show the icons for the popup links and the zoomboxes + * @param int $count on some charts it is important to keep a count of how many boxes were printed */ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $currpid, $censyear) { @@ -1480,9 +1480,9 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $person=Person::getInstance($pid); if ($pid==false || empty($person)) { - $spouselinks = false; - $parentlinks = false; - $step_parentlinks = false; + $spouselinks = false; + $parentlinks = false; + $step_parentlinks = false; } $tmp=array('M'=>'','F'=>'F', 'U'=>'NN'); @@ -1536,11 +1536,11 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", foreach ($children as $key=>$child) { $chnam = $child->getAllNames(); $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; - $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here + $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name - $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name + $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -1585,50 +1585,50 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surn']; } $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; - $parentlinks .= "'".PrintReady($husb->getXref())."',"; // pid = PID - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name + $parentlinks .= "'".PrintReady($husb->getXref())."',"; // pid = PID + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($nam[1])){ - $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name + $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name } else { - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name } if ($currpid=="Wife" || $currpid=="Husband") { - $parentlinks .= "'Father in Law',"; // label = 1st Gen Male Relationship + $parentlinks .= "'Father in Law',"; // label = 1st Gen Male Relationship }else{ - $parentlinks .= "'Grand-Father',"; // label = 2st Gen Male Relationship + $parentlinks .= "'Grand-Father',"; // label = 2st Gen Male Relationship } - $parentlinks .= "'".PrintReady($husb->getSex())."',"; // sex = Gender - $parentlinks .= "''".","; // cond = Condition (Married etc) + $parentlinks .= "'".PrintReady($husb->getSex())."',"; // sex = Gender + $parentlinks .= "''".","; // cond = Condition (Married etc) if ($marrdate) { - $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) + $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) } - $parentlinks .= "'".(($husb->getBirthDate()->minJD()+$husb->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth + $parentlinks .= "'".(($husb->getBirthDate()->minJD()+$husb->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth if ($husb->getbirthyear()>=1) { - $parentlinks .= "'".PrintReady($censyear-$husb->getbirthyear())."',"; // age = Census Year - Year of Birth + $parentlinks .= "'".PrintReady($censyear-$husb->getbirthyear())."',"; // age = Census Year - Year of Birth } else { - $parentlinks .= "''".","; // age = Undefined + $parentlinks .= "''".","; // age = Undefined } - $parentlinks .= "'".(($husb->getDeathDate()->minJD()+$husb->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death - $parentlinks .= "''".","; // occu = Occupation - $parentlinks .= "'".PrintReady($husb->getBirthPlace())."'".","; // birthpl = Individuals Birthplace + $parentlinks .= "'".(($husb->getDeathDate()->minJD()+$husb->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death + $parentlinks .= "''".","; // occu = Occupation + $parentlinks .= "'".PrintReady($husb->getBirthPlace())."'".","; // birthpl = Individuals Birthplace if (isset($pHusbFBP)) { - $parentlinks .= "'".$pHusbFBP."'".","; // fbirthpl = Fathers Birthplace + $parentlinks .= "'".$pHusbFBP."'".","; // fbirthpl = Fathers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace } if (isset($pHusbMBP)) { - $parentlinks .= "'".$pHusbMBP."'".","; // mbirthpl = Mothers Birthplace + $parentlinks .= "'".$pHusbMBP."'".","; // mbirthpl = Mothers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace } if (isset($chBLDarray) && $husb->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) + $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) } else { $parentlinks .= "''"; } $parentlinks .= ");\">"; - $parentlinks .= PrintReady($husb->getFullName()); // Full Name (Link) + $parentlinks .= PrintReady($husb->getFullName()); // Full Name (Link) $parentlinks .= "</a>"; }else{ $parentlinks .= i18n::translate('Private'); @@ -1688,50 +1688,50 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = $fulln; } $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; - $parentlinks .= "'".PrintReady($wife->getXref())."',"; // pid = PID - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name + $parentlinks .= "'".PrintReady($wife->getXref())."',"; // pid = PID + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($nam[1])){ - $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name + $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name } else { - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name } if ($currpid=="Wife" || $currpid=="Husband") { - $parentlinks .= "'Mother in Law',"; // label = 1st Gen Female Relationship + $parentlinks .= "'Mother in Law',"; // label = 1st Gen Female Relationship } else { - $parentlinks .= "'Grand-Mother',"; // label = 2st Gen Female Relationship + $parentlinks .= "'Grand-Mother',"; // label = 2st Gen Female Relationship } - $parentlinks .= "'".PrintReady($wife->getSex())."',"; // sex = Gender - $parentlinks .= "''".","; // cond = Condition (Married etc) + $parentlinks .= "'".PrintReady($wife->getSex())."',"; // sex = Gender + $parentlinks .= "''".","; // cond = Condition (Married etc) if ($marrdate) { - $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) + $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) } - $parentlinks .= "'".(($wife->getBirthDate()->minJD()+$wife->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth + $parentlinks .= "'".(($wife->getBirthDate()->minJD()+$wife->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth if ($wife->getbirthyear()>=1) { - $parentlinks .= "'".PrintReady($censyear-$wife->getbirthyear())."',"; // age = Census Year - Year of Birth + $parentlinks .= "'".PrintReady($censyear-$wife->getbirthyear())."',"; // age = Census Year - Year of Birth } else { - $parentlinks .= "''".","; // age = Undefined + $parentlinks .= "''".","; // age = Undefined } - $parentlinks .= "'".(($wife->getDeathDate()->minJD()+$wife->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death - $parentlinks .= "''".","; // occu = Occupation - $parentlinks .= "'".PrintReady($wife->getBirthPlace())."'".","; // birthpl = Individuals Birthplace + $parentlinks .= "'".(($wife->getDeathDate()->minJD()+$wife->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death + $parentlinks .= "''".","; // occu = Occupation + $parentlinks .= "'".PrintReady($wife->getBirthPlace())."'".","; // birthpl = Individuals Birthplace if (isset($pWifeFBP)) { - $parentlinks .= "'".$pWifeFBP."'".","; // fbirthpl = Fathers Birthplace + $parentlinks .= "'".$pWifeFBP."'".","; // fbirthpl = Fathers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known } if (isset($pWifeMBP)) { - $parentlinks .= "'".$pWifeMBP."'".","; // mbirthpl = Mothers Birthplace + $parentlinks .= "'".$pWifeMBP."'".","; // mbirthpl = Mothers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known } if (isset($chBLDarray) && $wife->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) + $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) } else { $parentlinks .= "''"; } - $parentlinks .= ");\">"; - $parentlinks .= PrintReady($wife->getFullName()); // Full Name (Link) + $parentlinks .= ");\">"; + $parentlinks .= PrintReady($wife->getFullName()); // Full Name (Link) $parentlinks .= "</a>"; }else{ $parentlinks .= i18n::translate('Private'); @@ -1761,11 +1761,11 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", foreach ($children as $key=>$child) { $chnam = $child->getAllNames(); $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; - $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here + $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name - $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name + $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -1813,50 +1813,50 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surname']; } $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; - $parentlinks .= "'".PrintReady($husb->getXref())."',"; // pid = PID - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name + $parentlinks .= "'".PrintReady($husb->getXref())."',"; // pid = PID + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($nam[1])){ - $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name + $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name } else { - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name } if ($currpid=="Wife" || $currpid=="Husband") { - $parentlinks .= "'Step Father-in-Law',"; // label = 1st Gen Male Relationship + $parentlinks .= "'Step Father-in-Law',"; // label = 1st Gen Male Relationship }else{ - $parentlinks .= "'Step Grand-Father',"; // label = 2st Gen Male Relationship + $parentlinks .= "'Step Grand-Father',"; // label = 2st Gen Male Relationship } - $parentlinks .= "'".PrintReady($husb->getSex())."',"; // sex = Gender - $parentlinks .= "''".","; // cond = Condition (Married etc) + $parentlinks .= "'".PrintReady($husb->getSex())."',"; // sex = Gender + $parentlinks .= "''".","; // cond = Condition (Married etc) if ($marrdate) { - $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) + $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) } - $parentlinks .= "'".(($husb->getBirthDate()->minJD()+$husb->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth + $parentlinks .= "'".(($husb->getBirthDate()->minJD()+$husb->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth if ($husb->getbirthyear()>=1) { - $parentlinks .= "'".PrintReady($censyear-$husb->getbirthyear())."',"; // age = Census Year - Year of Birth + $parentlinks .= "'".PrintReady($censyear-$husb->getbirthyear())."',"; // age = Census Year - Year of Birth } else { - $parentlinks .= "''".","; // age = Undefined + $parentlinks .= "''".","; // age = Undefined } - $parentlinks .= "'".(($husb->getDeathDate()->minJD()+$husb->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death - $parentlinks .= "''".","; // occu = Occupation - $parentlinks .= "'".PrintReady($husb->getBirthPlace())."'".","; // birthpl = Individuals Birthplace + $parentlinks .= "'".(($husb->getDeathDate()->minJD()+$husb->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death + $parentlinks .= "''".","; // occu = Occupation + $parentlinks .= "'".PrintReady($husb->getBirthPlace())."'".","; // birthpl = Individuals Birthplace if (isset($pHusbFBP)) { - $parentlinks .= "'".$pHusbFBP."'".","; // fbirthpl = Fathers Birthplace + $parentlinks .= "'".$pHusbFBP."'".","; // fbirthpl = Fathers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace } if (isset($pHusbMBP)) { - $parentlinks .= "'".$pHusbMBP."'".","; // mbirthpl = Mothers Birthplace + $parentlinks .= "'".$pHusbMBP."'".","; // mbirthpl = Mothers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace } if (isset($chBLDarray) && $husb->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) + $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) } else { $parentlinks .= "''"; } $parentlinks .= ");\">"; - $parentlinks .= PrintReady($husb->getFullName()); // Full Name (Link) + $parentlinks .= PrintReady($husb->getFullName()); // Full Name (Link) $parentlinks .= "</a>"; }else{ $parentlinks .= i18n::translate('Private'); @@ -1919,50 +1919,50 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = $fulln; } $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; - $parentlinks .= "'".PrintReady($wife->getXref())."',"; // pid = PID - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name + $parentlinks .= "'".PrintReady($wife->getXref())."',"; // pid = PID + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($nam[1])){ - $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name + $parentlinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name } else { - $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name + $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name } if ($currpid=="Wife" || $currpid=="Husband") { - $parentlinks .= "'Step Mother-in-Law',"; // label = 1st Gen Female Relationship + $parentlinks .= "'Step Mother-in-Law',"; // label = 1st Gen Female Relationship } else { - $parentlinks .= "'Step Grand-Mother',"; // label = 2st Gen Female Relationship + $parentlinks .= "'Step Grand-Mother',"; // label = 2st Gen Female Relationship } - $parentlinks .= "'".PrintReady($wife->getSex())."',"; // sex = Gender - $parentlinks .= "''".","; // cond = Condition (Married etc) + $parentlinks .= "'".PrintReady($wife->getSex())."',"; // sex = Gender + $parentlinks .= "''".","; // cond = Condition (Married etc) if ($marrdate) { - $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) + $parentlinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) } - $parentlinks .= "'".(($wife->getBirthDate()->minJD()+$wife->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth + $parentlinks .= "'".(($wife->getBirthDate()->minJD()+$wife->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth if ($wife->getbirthyear()>=1) { - $parentlinks .= "'".PrintReady($censyear-$wife->getbirthyear())."',"; // age = Census Year - Year of Birth + $parentlinks .= "'".PrintReady($censyear-$wife->getbirthyear())."',"; // age = Census Year - Year of Birth } else { - $parentlinks .= "''".","; // age = Undefined + $parentlinks .= "''".","; // age = Undefined } - $parentlinks .= "'".(($wife->getDeathDate()->minJD()+$wife->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death - $parentlinks .= "''".","; // occu = Occupation - $parentlinks .= "'".PrintReady($wife->getBirthPlace())."'".","; // birthpl = Individuals Birthplace + $parentlinks .= "'".(($wife->getDeathDate()->minJD()+$wife->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death + $parentlinks .= "''".","; // occu = Occupation + $parentlinks .= "'".PrintReady($wife->getBirthPlace())."'".","; // birthpl = Individuals Birthplace if (isset($pWifeFBP)) { - $parentlinks .= "'".$pWifeFBP."'".","; // fbirthpl = Fathers Birthplace + $parentlinks .= "'".$pWifeFBP."'".","; // fbirthpl = Fathers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known } if (isset($pWifeMBP)) { - $parentlinks .= "'".$pWifeMBP."'".","; // mbirthpl = Mothers Birthplace + $parentlinks .= "'".$pWifeMBP."'".","; // mbirthpl = Mothers Birthplace } else { - $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known + $parentlinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known } if (isset($chBLDarray) && $wife->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) + $parentlinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) } else { $parentlinks .= "''"; } - $parentlinks .= ");\">"; - $parentlinks .= PrintReady($wife->getFullName()); // Full Name (Link) + $parentlinks .= ");\">"; + $parentlinks .= PrintReady($wife->getFullName()); // Full Name (Link) $parentlinks .= "</a>"; }else{ $parentlinks .= i18n::translate('Private'); @@ -1990,11 +1990,11 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", foreach ($children as $key=>$child) { $chnam = $child->getAllNames(); $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; - $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here + $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name - $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name + $chdob = ($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -2040,58 +2040,58 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surname']; } $spouselinks .= "<a href=\"javascript:insertRowToTable("; - $spouselinks .= "'".PrintReady($spouse->getXref())."',"; // pid = PID - $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name + $spouselinks .= "'".PrintReady($spouse->getXref())."',"; // pid = PID + $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($nam[1])){ - $spouselinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name + $spouselinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name } else { - $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name + $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name } if ($currpid=="Son" || $currpid=="Daughter") { if ($spouse->getSex()=="M") { - $spouselinks .= "'Son in Law',"; // label = Male Relationship + $spouselinks .= "'Son in Law',"; // label = Male Relationship }else{ - $spouselinks .= "'Daughter in Law',"; // label = Female Relationship + $spouselinks .= "'Daughter in Law',"; // label = Female Relationship } } else { if ($spouse->getSex()=="M") { - $spouselinks .= "'Brother in Law',"; // label = Male Relationship + $spouselinks .= "'Brother in Law',"; // label = Male Relationship } else { - $spouselinks .= "'Sister in Law',"; // label = Female Relationship + $spouselinks .= "'Sister in Law',"; // label = Female Relationship } } - $spouselinks .= "'".PrintReady($spouse->getSex())."',"; // sex = Gender - $spouselinks .= "''".","; // cond = Condition (Married etc) + $spouselinks .= "'".PrintReady($spouse->getSex())."',"; // sex = Gender + $spouselinks .= "''".","; // cond = Condition (Married etc) if ($marrdate) { - $spouselinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) + $spouselinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) } - $spouselinks .= "'".(($spouse->getBirthDate()->minJD()+$spouse->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth + $spouselinks .= "'".(($spouse->getBirthDate()->minJD()+$spouse->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth if ($spouse->getbirthyear()>=1) { - $spouselinks .= "'".PrintReady($censyear-$spouse->getbirthyear())."',"; // age = Census Year - Year of Birth + $spouselinks .= "'".PrintReady($censyear-$spouse->getbirthyear())."',"; // age = Census Year - Year of Birth } else { - $spouselinks .= "''".","; // age = Undefined + $spouselinks .= "''".","; // age = Undefined } - $spouselinks .= "'".(($spouse->getDeathDate()->minJD()+$spouse->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death - $spouselinks .= "''".","; // occu = Occupation - $spouselinks .= "'".PrintReady($spouse->getBirthPlace())."'".","; // birthpl = Individuals Birthplace + $spouselinks .= "'".(($spouse->getDeathDate()->minJD()+$spouse->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death + $spouselinks .= "''".","; // occu = Occupation + $spouselinks .= "'".PrintReady($spouse->getBirthPlace())."'".","; // birthpl = Individuals Birthplace if (isset($pSpouseFBP)) { - $spouselinks .= "'".$pSpouseFBP."'".","; // fbirthpl = Fathers Birthplace + $spouselinks .= "'".$pSpouseFBP."'".","; // fbirthpl = Fathers Birthplace } else { - $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known + $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known } if (isset($pSpouseMBP)) { - $spouselinks .= "'".$pSpouseMBP."'".","; // mbirthpl = Mothers Birthplace + $spouselinks .= "'".$pSpouseMBP."'".","; // mbirthpl = Mothers Birthplace } else { - $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known + $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known } if (isset($chBLDarray) && $spouse->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - $spouselinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) + $spouselinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) } else { $spouselinks .= "''"; } - $spouselinks .= ");\">"; - $spouselinks .= PrintReady($spouse->getFullName()); // Full Name (Link) + $spouselinks .= ");\">"; + $spouselinks .= PrintReady($spouse->getFullName()); // Full Name (Link) $spouselinks .= "</a>"; }else{ $spouselinks .= i18n::translate('Private'); @@ -2130,11 +2130,11 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", foreach ($chchildren as $key=>$chchild) { $chnam = $chchild->getAllNames(); $chfulln = rtrim($chnam[0]['givn'],'*')." ".$chnam[0]['surname']; - $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here + $chfulln = str_replace('"', "", $chfulln); // Must remove quotes completely here $chfulln = str_replace("@N.N.", "(".i18n::translate('unknown').")", $chfulln); - $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name - $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) - $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) + $chfulln = str_replace("@P.N.", "(".i18n::translate('unknown').")", $chfulln); // Child's Full Name + $chdob = ($chchild->getBirthDate()->minJD()+$chchild->getBirthDate()->maxJD())/2; // Child's Date of Birth (Julian) + $chdod = ($chchild->getDeathDate()->minJD()+$chchild->getDeathDate()->maxJD())/2; // Child's Date of Death (Julian) $chBLD = ($chfulln.", ".$chdob.", ".$chdod); array_push($chBLDarray, $chBLD); } @@ -2168,60 +2168,60 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", } $spouselinks .= "<a href=\"javascript:insertRowToTable("; - $spouselinks .= "'".PrintReady($child->getXref())."',"; // pid = PID - $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name + $spouselinks .= "'".PrintReady($child->getXref())."',"; // pid = PID + $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($nam[1])){ - $spouselinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name + $spouselinks .= "'".addslashes(strip_tags($fulmn))."',"; // mnam = Full Married Name } else { - $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name + $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // mnam = Full Name } if ($currpid=="Son" || $currpid=="Daughter") { if ($child->getSex()=="M") { - $spouselinks .= "'Grand-Son',"; // label = Male Relationship + $spouselinks .= "'Grand-Son',"; // label = Male Relationship }else{ - $spouselinks .= "'Grand-Daughter',"; // label = Female Relationship + $spouselinks .= "'Grand-Daughter',"; // label = Female Relationship } }else{ if ($child->getSex()=="M") { - $spouselinks .= "'Nephew',"; // label = Male Relationship + $spouselinks .= "'Nephew',"; // label = Male Relationship }else{ - $spouselinks .= "'Niece',"; // label = Female Relationship + $spouselinks .= "'Niece',"; // label = Female Relationship } } - $spouselinks .= "'".PrintReady($child->getSex())."',"; // sex = Gender - $spouselinks .= "''".","; // cond = Condition (Married etc) + $spouselinks .= "'".PrintReady($child->getSex())."',"; // sex = Gender + $spouselinks .= "''".","; // cond = Condition (Married etc) if ($marrdate) { - $spouselinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) + $spouselinks .= "'".(($marrdate->minJD()+$marrdate->maxJD())/2)."',"; // dom = Date of Marriage (Julian) } else { - $spouselinks .= "'nm'".","; + $spouselinks .= "'nm'".","; } - $spouselinks .= "'".(($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth + $spouselinks .= "'".(($child->getBirthDate()->minJD()+$child->getBirthDate()->maxJD())/2)."',"; // dob = Date of Birth if ($child->getbirthyear()>=1) { - $spouselinks .= "'".PrintReady($censyear-$child->getbirthyear())."',"; // age = Census Year - Year of Birth + $spouselinks .= "'".PrintReady($censyear-$child->getbirthyear())."',"; // age = Census Year - Year of Birth }else{ - $spouselinks .= "''".","; // age = Undefined + $spouselinks .= "''".","; // age = Undefined } - $spouselinks .= "'".(($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death - $spouselinks .= "''".","; // occu = Occupation - $spouselinks .= "'".PrintReady($child->getBirthPlace())."'".","; // birthpl = Individuals Birthplace + $spouselinks .= "'".(($child->getDeathDate()->minJD()+$child->getDeathDate()->maxJD())/2)."',"; // dod = Date of Death + $spouselinks .= "''".","; // occu = Occupation + $spouselinks .= "'".PrintReady($child->getBirthPlace())."'".","; // birthpl = Individuals Birthplace if (isset($ChildFBP)) { - $spouselinks .= "'".$ChildFBP."'".","; // fbirthpl = Fathers Birthplace + $spouselinks .= "'".$ChildFBP."'".","; // fbirthpl = Fathers Birthplace } else { - $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known + $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // fbirthpl = Fathers Birthplace Not Known } if (isset($ChildMBP)) { - $spouselinks .= "'".$ChildMBP."'".","; // mbirthpl = Mothers Birthplace + $spouselinks .= "'".$ChildMBP."'".","; // mbirthpl = Mothers Birthplace } else { - $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known + $spouselinks .= "'UNK, UNK, UNK, UNK'".","; // mbirthpl = Mothers Birthplace Not Known } if (isset($chBLDarray) && $child->getSex()=="F") { $chBLDarray = implode("::", $chBLDarray); - $spouselinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) + $spouselinks .= "'".$chBLDarray."'"; // Array of Children (name, birthdate, deathdate) } else { $spouselinks .= "''"; } - $spouselinks .= ");\">"; - $spouselinks .= PrintReady($child->getFullName()); // Full Name (Link) + $spouselinks .= ");\">"; + $spouselinks .= PrintReady($child->getFullName()); // Full Name (Link) $spouselinks .= "</a>"; $spouselinks .= "</li>\n"; }else{ diff --git a/modules/GEDFact_assistant/_CENS/census_asst_date.php b/modules/GEDFact_assistant/_CENS/census_asst_date.php index 863654acba..93448f8bbb 100644 --- a/modules/GEDFact_assistant/_CENS/census_asst_date.php +++ b/modules/GEDFact_assistant/_CENS/census_asst_date.php @@ -43,7 +43,7 @@ } </script> - <select id="selcensdate" name="selcensdate" onchange = "if (this.options[this.selectedIndex].value!='') { + <select id="selcensdate" name="selcensdate" onchange = "if (this.options[this.selectedIndex].value!='') { addDate(this.options[this.selectedIndex].value); }"> <option id="defdate" name="defdate" value='' SELECTED>Census Date</option> @@ -77,7 +77,3 @@ <input type="hidden" id="setctry" name="setctry" value="" /> <input type="hidden" id="setyear" name="setyear" value="" /> - - - - diff --git a/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php b/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php index 324d580e10..88daa7c769 100644 --- a/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php +++ b/modules/GEDFact_assistant/_CENS/js/census_5_input.js.php @@ -225,7 +225,7 @@ function preview() { } // UK 1901 =============== } else if (NoteYear.value=="1901") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || j==36 || j==37 || (j>=39 && j<=41) || (j>=43 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) { continue; }else{ @@ -238,7 +238,7 @@ function preview() { } // UK 1891 =============== } else if (NoteYear.value=="1891") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || (j>=36 && j<=38) || j==41 || j==42 || (j>=44 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) { continue; }else{ @@ -251,7 +251,7 @@ function preview() { } // UK 1951-1881 ============ } else if (NoteYear.value=="1851" || NoteYear.value=="1861" || NoteYear.value=="1871" || NoteYear.value=="1881") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( j==5 || j==6 || j==8 || (j>=10 && j<=34) || (j>=36 && j<=49) || (j>=51 && j<=62) || (j>=64 && j<=73) ) { continue; }else{ @@ -264,7 +264,7 @@ function preview() { } // UK 1841 =============== } else if (NoteYear.value=="1841") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( (j>=3 && j<=6) || j==8 || (j>=10 && j<=34) || (j>=36 && j<=51) || (j>=54 && j<=73) ) { continue; }else{ @@ -280,7 +280,7 @@ function preview() { } else if (NoteCtry.value=="USA") { // USA 1930 =============== if (NoteYear.value=="1930") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( j==4 || j==5 || j==7 || j==8 || j==11 || j==13 || j==14 || (j>=16 && j<=19) || (j>=21 && j<=45) || (j>=47 && j<=50) || j==52 || j==53 || j==63 || j==64 || j>=67 && j<=73 ) { continue; }else{ @@ -295,7 +295,7 @@ function preview() { // USA 1920 =============== else if (NoteYear.value=="1920") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( j==4 || (j>=6 && j<=8) || j==11 || j==13 || j==14 || (j>=16 && j<=30) || (j>=34 && j<=45) || (j>=47 && j<=50) || j==52 || j==53 || j==57 || j==58 || (j>=63 && j<=73) ) { continue; }else{ @@ -310,7 +310,7 @@ function preview() { // USA 1910 =============== else if (NoteYear.value=="1910") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( (j>=4 && j<=8) || j==11 || j==13 || j==14 || (j>=19 && j<=26) || j==30 || j==33 || j==36 || (j>=39 && j<=42) || j==45 || j==47 || j==48 || (j>=50 && j<=64) || j==66 || j>=68 && j<=73 ) { continue; }else{ @@ -324,7 +324,7 @@ function preview() { } // USA 1900 =============== else if (NoteYear.value=="1900") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( (j>=4 && j<=7) || j==10 || j==13 || j==14 || (j>=19 && j<=26) || j==33 || j==34 || (j>=36 && j<=44) || j==47 || (j>=50 && j<=73) ) { continue; }else{ @@ -338,7 +338,7 @@ function preview() { } // USA 1890 =============== else if (NoteYear.value=="1890") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( (j>=4 && j<=7) || j==10 || j==11 || j==13 || j==14 || (j>=19 && j<=26) || j==31 || j==33 || j==34 || j==36 || j==37 || j==39 || j==40 || (j>=42 && j<=45) || j==47 || (j>=49 && j<=63) || (j>=65 && j<=73) ) { continue; }else{ @@ -352,7 +352,7 @@ function preview() { } // USA 1880 =============== else if (NoteYear.value=="1880") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( (j>=3 && j<=7) || j==10 || j==11 || (j>=17 && j<=34) || (j>=37 && j<=44) || (j>=40 && j<=42) || j==46 || j==49 || j==50 || j==52 || j==53 || (j>=56 && j<=73) ) { continue; }else{ @@ -366,7 +366,7 @@ function preview() { } // USA 1870 =============== else if (NoteYear.value=="1870") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( (j>=3 && j<=6) || j==8 || (j>=11 && j<=20) || (j>=27 && j<=46) || (j>=48 && j<=62) || (j>=64 && j<=73) ) { continue; }else{ @@ -380,7 +380,7 @@ function preview() { } // USA 1860 or 1850 =============== else if (NoteYear.value=="1860" || NoteYear.value=="1850") { - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if ( (j>=3 && j<=6) || j==8 || (j>=11 && j<=20) || j==24 || j==25 || (j>=27 && j<=46) || (j>=48 && j<=62) || (j>=64 && j<=73) ) { continue; }else{ @@ -403,7 +403,7 @@ function preview() { } // Reset/Check the Pink Highlighting of the Name field and Age fields for any person not born ------------------ - for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # + for(var j=2; j<tr.cells.length-3; j++) { // == j=2 means miss out cols 0 and 1 (# and pid), cells.length-3 means miss out del, ins and item # if (i==0) { // Do nothing as this is the header row. }else{ @@ -426,9 +426,9 @@ function preview() { //changeAge(NoteYear.value); // --- Debug only - alert indi id's found -------- - // if (i!=0) { - // alert(iid); - // } + //if (i!=0) { + //alert(iid); + //} var mem = document.getElementById('NOTE'); if (Notes.value!="" && Notes.value!=null) { @@ -458,7 +458,7 @@ function fillInRows() { } // myRowObject - an object for storing information about the table rows -function myRowObject( zero, one, two, three, four, five, six, seven, eight, nine, +function myRowObject( zero, one, two, three, four, five, six, seven, eight, nine, ten, eleven, twelve, thirteen, fourteen, fifteen, sixteen, seventeen, eighteen, nineteen, twenty, twentyone, twentytwo, twentythree, twentyfour, twentyfive, twentysix, twentyseven, twentyeight, twentynine, thirty, thirtyone, thirtytwo, thirtythree, thirtyfour, thirtyfive, thirtysix, thirtyseven, thirtyeight, thirtynine, @@ -470,84 +470,84 @@ function myRowObject( zero, one, two, three, four, five, six, seven, eight, nine ) { - this.zero = zero; // text object - this.one = one; // input text object - this.two = two; // input text object - this.three = three; // input text object - this.four = four; // input text object - this.five = five; // input text object - this.six = six; // input text object - this.seven = seven; // input text object - this.eight = eight; // input text object - this.nine = nine; // input text object - this.ten = ten; // input text object - this.eleven = eleven; // input text object - this.twelve = twelve; // input text object - this.thirteen = thirteen; // input text object - this.fourteen = fourteen; // input text object - this.fifteen = fifteen; // input text object - this.sixteen = sixteen; // input text object - this.seventeen = seventeen; // input text object - this.eighteen = eighteen; // input text object - this.nineteen = nineteen; // input text object - this.twenty = twenty; // input text object - this.twentyone = twentyone; // input text object - this.twentytwo = twentytwo; // input text object - this.twentythree = twentythree; // input text object - this.twentyfour = twentyfour; // input text object - this.twentyfive = twentyfive; // input text object - this.twentysix = twentysix; // input text object - this.twentyseven = twentyseven; // input text object - this.twentyeight = twentyeight; // input text object - this.twentynine = twentynine; // input text object - this.thirty = thirty; // input text object - this.thirtyone = thirtyone; // input text object - this.thirtytwo = thirtytwo; // input text object - this.thirtythree = thirtythree; // input text object - this.thirtyfour = thirtyfour; // input text object - this.thirtyfive = thirtyfive; // input text object - this.thirtysix = thirtysix; // input text object - this.thirtyseven = thirtyseven; // input text object - this.thirtyeight = thirtyeight; // input text object - this.thirtynine = thirtynine; // input text object - this.forty = forty; // input text object - this.fortyone = fortyone; // input text object - this.fortytwo = fortytwo; // input text object - this.fortythree = fortythree; // input text object - this.fortyfour = fortyfour; // input text object - this.fortyfive = fortyfive; // input text object - this.fortysix = fortysix; // input text object - this.fortyseven = fortyseven; // input text object - this.fortyeight = fortyeight; // input text object - this.fortynine = fortynine; // input text object - this.fifty = fifty; // input text object - this.fiftyone = fiftyone; // input text object - this.fiftytwo = fiftytwo; // input text object - this.fiftythree = fiftythree; // input text object - this.fiftyfour = fiftyfour; // input text object - this.fiftyfive = fiftyfive; // input text object - this.fiftysix = fiftysix; // input text object - this.fiftyseven = fiftyseven; // input text object - this.fiftyeight = fiftyeight; // input text object - this.fiftynine = fiftynine; // input text object - this.sixty = sixty; // input text object - this.sixtyone = sixtyone; // input text object - this.sixtytwo = sixtytwo; // input text object - this.sixtythree = sixtythree; // input text object - this.sixtyfour = sixtyfour; // input text object - this.sixtyfive = sixtyfive; // input text object - this.sixtysix = sixtysix; // input text object - this.sixtyseven = sixtyseven; // input text object - this.sixtyeight = sixtyeight; // input text object - this.sixtynine = sixtynine; // input text object - this.seventy = seventy; // input text object - this.seventyone = seventyone; // input text object - this.seventytwo = seventytwo; // input text object - this.seventythree = seventythree; // input text object + this.zero = zero; // text object + this.one = one; // input text object + this.two = two; // input text object + this.three = three; // input text object + this.four = four; // input text object + this.five = five; // input text object + this.six = six; // input text object + this.seven = seven; // input text object + this.eight = eight; // input text object + this.nine = nine; // input text object + this.ten = ten; // input text object + this.eleven = eleven; // input text object + this.twelve = twelve; // input text object + this.thirteen = thirteen; // input text object + this.fourteen = fourteen; // input text object + this.fifteen = fifteen; // input text object + this.sixteen = sixteen; // input text object + this.seventeen = seventeen; // input text object + this.eighteen = eighteen; // input text object + this.nineteen = nineteen; // input text object + this.twenty = twenty; // input text object + this.twentyone = twentyone; // input text object + this.twentytwo = twentytwo; // input text object + this.twentythree = twentythree; // input text object + this.twentyfour = twentyfour; // input text object + this.twentyfive = twentyfive; // input text object + this.twentysix = twentysix; // input text object + this.twentyseven = twentyseven; // input text object + this.twentyeight = twentyeight; // input text object + this.twentynine = twentynine; // input text object + this.thirty = thirty; // input text object + this.thirtyone = thirtyone; // input text object + this.thirtytwo = thirtytwo; // input text object + this.thirtythree = thirtythree; // input text object + this.thirtyfour = thirtyfour; // input text object + this.thirtyfive = thirtyfive; // input text object + this.thirtysix = thirtysix; // input text object + this.thirtyseven = thirtyseven; // input text object + this.thirtyeight = thirtyeight; // input text object + this.thirtynine = thirtynine; // input text object + this.forty = forty; // input text object + this.fortyone = fortyone; // input text object + this.fortytwo = fortytwo; // input text object + this.fortythree = fortythree; // input text object + this.fortyfour = fortyfour; // input text object + this.fortyfive = fortyfive; // input text object + this.fortysix = fortysix; // input text object + this.fortyseven = fortyseven; // input text object + this.fortyeight = fortyeight; // input text object + this.fortynine = fortynine; // input text object + this.fifty = fifty; // input text object + this.fiftyone = fiftyone; // input text object + this.fiftytwo = fiftytwo; // input text object + this.fiftythree = fiftythree; // input text object + this.fiftyfour = fiftyfour; // input text object + this.fiftyfive = fiftyfive; // input text object + this.fiftysix = fiftysix; // input text object + this.fiftyseven = fiftyseven; // input text object + this.fiftyeight = fiftyeight; // input text object + this.fiftynine = fiftynine; // input text object + this.sixty = sixty; // input text object + this.sixtyone = sixtyone; // input text object + this.sixtytwo = sixtytwo; // input text object + this.sixtythree = sixtythree; // input text object + this.sixtyfour = sixtyfour; // input text object + this.sixtyfive = sixtyfive; // input text object + this.sixtysix = sixtysix; // input text object + this.sixtyseven = sixtyseven; // input text object + this.sixtyeight = sixtyeight; // input text object + this.sixtynine = sixtynine; // input text object + this.seventy = seventy; // input text object + this.seventyone = seventyone; // input text object + this.seventytwo = seventytwo; // input text object + this.seventythree = seventythree; // input text object - this.cb = cb; // input checkbox object - this.ra = ra; // input radio object - this.index2 = index2; // text object + this.cb = cb; // input checkbox object + this.ra = ra; // input radio object + this.index2 = index2; // text object } function create_header() { @@ -804,15 +804,15 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d } if (iteration == 0) { - var cell_tdel = row.insertCell(74); // text Del - var cell_tra = row.insertCell(75); // text Radio + var cell_tdel = row.insertCell(74); // text Del + var cell_tra = row.insertCell(75); // text Radio }else{ - var cell_del = row.insertCell(74); // Onclick = Delete Row + var cell_del = row.insertCell(74); // Onclick = Delete Row cell_del.setAttribute('align', 'center'); - var cell_ra = row.insertCell(75); // Radio button used for inserting a row, rather than adding at end of table) + var cell_ra = row.insertCell(75); // Radio button used for inserting a row, rather than adding at end of table) } - var cell_index2 = row.insertCell(76); // Item Number (#2) + var cell_index2 = row.insertCell(76); // Item Number (#2) cell_index2.setAttribute('id', 'index2'); cell_index2.setAttribute('name', 'index2'); cell_index2.setAttribute('align', 'center'); @@ -1497,7 +1497,7 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d // 0. Item Number --------------------------------------------------- // var txt_itemNo = document.createTextNode(iteration); var txt_itemNo = document.createElement('div'); - // txt_itemNo.style.display="none"; + // txt_itemNo.style.display="none"; // 1. Indi ID ------------------------------------------------------- if ( pid == ''){ var txtcolor = "#000000"; @@ -2256,9 +2256,9 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d // Extra Cells for Navigation ========================================= // 74. Extra 1. Delete Row Button ----------------------------------------- //var btnEl = document.createElement('input'); - // btnEl.setAttribute('type', 'button'); - // btnEl.setAttribute('value', 'x'); - // btnEl.onclick = function () {deleteCurrentRow(this)}; + // btnEl.setAttribute('type', 'button'); + // btnEl.setAttribute('value', 'x'); + // btnEl.onclick = function () {deleteCurrentRow(this)}; var btnEl = document.createElement('button'); var btnEltext = document.createTextNode('X'); btnEl.style.color='red'; @@ -2285,106 +2285,106 @@ function addRowToTable(num, pid, nam, mnam, label, gend, cond, dom, dob, age2, d // **E** Append appropriate Cell elements to each cell ================ - cell_[0].appendChild(txt_itemNo); // Item Number - cell_[1].appendChild(txtInp_pid); // Indi ID - cell_[2].appendChild(txtInp_nam); // Name - cell_[3].appendChild(txtInp_label); // Relationship_1 - cell_[4].appendChild(txtInp_cond); // Condition_1 - cell_[5].appendChild(txtInp_tenure); // Tenure - cell_[6].appendChild(txtInp_assets); // Assets_1 - cell_[7].appendChild(txtInp_age); // Age_1 - cell_[8].appendChild(txtInp_race); // Race_1 - cell_[9].appendChild(txtInp_gend); // Sex + cell_[0].appendChild(txt_itemNo); // Item Number + cell_[1].appendChild(txtInp_pid); // Indi ID + cell_[2].appendChild(txtInp_nam); // Name + cell_[3].appendChild(txtInp_label); // Relationship_1 + cell_[4].appendChild(txtInp_cond); // Condition_1 + cell_[5].appendChild(txtInp_tenure); // Tenure + cell_[6].appendChild(txtInp_assets); // Assets_1 + cell_[7].appendChild(txtInp_age); // Age_1 + cell_[8].appendChild(txtInp_race); // Race_1 + cell_[9].appendChild(txtInp_gend); // Sex - cell_[10].appendChild(txtInp_race2); // Race_2 - cell_[11].appendChild(txtInp_yob); // DOB/YOB - cell_[12].appendChild(txtInp_age2); // Age_2 - cell_[13].appendChild(txtInp_bmth); // Birth Month - cell_[14].appendChild(txtInp_label2); // Relationship_2 - cell_[15].appendChild(txtInp_cond2); // Condition_2 - cell_[16].appendChild(txtInp_yrsm); // Years Married - cell_[17].appendChild(txtInp_chilB); // Children Born Alive - cell_[18].appendChild(txtInp_chilL); // Children Still Living - cell_[19].appendChild(txtInp_chilD); // Children who have Died + cell_[10].appendChild(txtInp_race2); // Race_2 + cell_[11].appendChild(txtInp_yob); // DOB/YOB + cell_[12].appendChild(txtInp_age2); // Age_2 + cell_[13].appendChild(txtInp_bmth); // Birth Month + cell_[14].appendChild(txtInp_label2); // Relationship_2 + cell_[15].appendChild(txtInp_cond2); // Condition_2 + cell_[16].appendChild(txtInp_yrsm); // Years Married + cell_[17].appendChild(txtInp_chilB); // Children Born Alive + cell_[18].appendChild(txtInp_chilL); // Children Still Living + cell_[19].appendChild(txtInp_chilD); // Children who have Died - cell_[20].appendChild(txtInp_ageM); // Age st first marriage - cell_[21].appendChild(txtInp_occu); // Occupation_1 - cell_[22].appendChild(txtInp_assets2); // Assets_2 - cell_[23].appendChild(txtInp_birthpl); // Place of Birth_1 - cell_[24].appendChild(txtInp_parent); // Parentage - cell_[25].appendChild(txtInp_bmth2); // Month if born in Census Year - bmth2 - cell_[26].appendChild(txtInp_mmth); // Month if married in Census Year - cell_[27].appendChild(txtInp_ibirthpl); // Indis POB_1 - cell_[28].appendChild(txtInp_fbirthpl); // Father FPOB_1 - cell_[29].appendChild(txtInp_mbirthpl); // Mother MPOB_1 + cell_[20].appendChild(txtInp_ageM); // Age st first marriage + cell_[21].appendChild(txtInp_occu); // Occupation_1 + cell_[22].appendChild(txtInp_assets2); // Assets_2 + cell_[23].appendChild(txtInp_birthpl); // Place of Birth_1 + cell_[24].appendChild(txtInp_parent); // Parentage + cell_[25].appendChild(txtInp_bmth2); // Month if born in Census Year - bmth2 + cell_[26].appendChild(txtInp_mmth); // Month if married in Census Year + cell_[27].appendChild(txtInp_ibirthpl); // Indis POB_1 + cell_[28].appendChild(txtInp_fbirthpl); // Father FPOB_1 + cell_[29].appendChild(txtInp_mbirthpl); // Mother MPOB_1 - cell_[30].appendChild(txtInp_yrsUS); // Years in USA - cell_[31].appendChild(txtInp_yoi1); // Year of Immigration YOI_1 - cell_[32].appendChild(txtInp_na1); // Naturalized or Alien N-A_1 - cell_[33].appendChild(txtInp_yon); // Year of Naturalization YON - cell_[34].appendChild(txtInp_englang); // English spoken, if not, Other Language spoken Eng/Lang - cell_[35].appendChild(txtInp_occu2); // Occupation_2 - cell_[36].appendChild(txtInp_health); // Health - 5 parameters x--xx etc - cell_[37].appendChild(txtInp_ind1); // Industry ind_1 - cell_[38].appendChild(txtInp_emp1); // Employ_1 - cell_[39].appendChild(txtInp_emR); // Employer EmR + cell_[30].appendChild(txtInp_yrsUS); // Years in USA + cell_[31].appendChild(txtInp_yoi1); // Year of Immigration YOI_1 + cell_[32].appendChild(txtInp_na1); // Naturalized or Alien N-A_1 + cell_[33].appendChild(txtInp_yon); // Year of Naturalization YON + cell_[34].appendChild(txtInp_englang); // English spoken, if not, Other Language spoken Eng/Lang + cell_[35].appendChild(txtInp_occu2); // Occupation_2 + cell_[36].appendChild(txtInp_health); // Health - 5 parameters x--xx etc + cell_[37].appendChild(txtInp_ind1); // Industry ind_1 + cell_[38].appendChild(txtInp_emp1); // Employ_1 + cell_[39].appendChild(txtInp_emR); // Employer EmR - cell_[40].appendChild(txtInp_emD); // Employed EmD - cell_[41].appendChild(txtInp_mnsE); // Months employed during Census Year - cell_[42].appendChild(txtInp_emH); // Working At Home WH - cell_[43].appendChild(txtInp_emN); // Not Employed EmN - cell_[44].appendChild(txtInp_wksU); // Weeks unemployed during Census Year - cell_[45].appendChild(txtInp_mnsU); // Months unemployed during Census Year - cell_[46].appendChild(txtInp_educ); // Education 3 parameters Sch-Read-Write -xx - cell_[47].appendChild(txtInp_educpre1890); // Education (pre 1890 Census) - 3 parameters = Sch, Cannot Read, Cannot Write -xx - cell_[48].appendChild(txtInp_eng1); // English spoken Y/N eng_1 - cell_[49].appendChild(txtInp_home); // Home Ownership x-x-x-xxxx = Owned/Rented - Free/Morgaged - Farm/House - Farm Sched # + cell_[40].appendChild(txtInp_emD); // Employed EmD + cell_[41].appendChild(txtInp_mnsE); // Months employed during Census Year + cell_[42].appendChild(txtInp_emH); // Working At Home WH + cell_[43].appendChild(txtInp_emN); // Not Employed EmN + cell_[44].appendChild(txtInp_wksU); // Weeks unemployed during Census Year + cell_[45].appendChild(txtInp_mnsU); // Months unemployed during Census Year + cell_[46].appendChild(txtInp_educ); // Education 3 parameters Sch-Read-Write -xx + cell_[47].appendChild(txtInp_educpre1890); // Education (pre 1890 Census) - 3 parameters = Sch, Cannot Read, Cannot Write -xx + cell_[48].appendChild(txtInp_eng1); // English spoken Y/N eng_1 + cell_[49].appendChild(txtInp_home); // Home Ownership x-x-x-xxxx = Owned/Rented - Free/Morgaged - Farm/House - Farm Sched # - cell_[50].appendChild(txtInp_birthpl2); // Birth Place_2 - cell_[51].appendChild(txtInp_ibirthpl2); // Indis POB_2 - cell_[52].appendChild(txtInp_bic); // Born in County (UK) - cell_[53].appendChild(txtInp_boe); // Born outside England (UK) - cell_[54].appendChild(txtInp_fbirthpl2); // Fathers FPOB_2 - cell_[55].appendChild(txtInp_mbirthpl2); // Mothers MPOB_2 - cell_[56].appendChild(txtInp_lang); // Mother Tongue lang - cell_[57].appendChild(txtInp_yoi2); // Year of Immigration YOI_2 - cell_[58].appendChild(txtInp_na2); // Naturalized or Alien N-A_2 - cell_[59].appendChild(txtInp_eng2); // English spoken Y/N eng_2 + cell_[50].appendChild(txtInp_birthpl2); // Birth Place_2 + cell_[51].appendChild(txtInp_ibirthpl2); // Indis POB_2 + cell_[52].appendChild(txtInp_bic); // Born in County (UK) + cell_[53].appendChild(txtInp_boe); // Born outside England (UK) + cell_[54].appendChild(txtInp_fbirthpl2); // Fathers FPOB_2 + cell_[55].appendChild(txtInp_mbirthpl2); // Mothers MPOB_2 + cell_[56].appendChild(txtInp_lang); // Mother Tongue lang + cell_[57].appendChild(txtInp_yoi2); // Year of Immigration YOI_2 + cell_[58].appendChild(txtInp_na2); // Naturalized or Alien N-A_2 + cell_[59].appendChild(txtInp_eng2); // English spoken Y/N eng_2 - cell_[60].appendChild(txtInp_occu3); // Occupation_3 - cell_[61].appendChild(txtInp_ind2); // Industry ind_2 - cell_[62].appendChild(txtInp_emp2); // Employ_2 - // cell_[63].appendChild(txtInp_N_ality); // Nationality (UK 1911) - British, OR Naturalised, OR(French, German, Russian etc) - cell_[63].appendChild(txtInp_infirm); // Infirmaties - up to 5 parameters x--xx etc - cell_[64].appendChild(txtInp_situ); // Health Situation 1890 - Disease, Infimaties, Convict, Pauper etc - cell_[65].appendChild(txtInp_vet); // Veteran ? - cell_[66].appendChild(txtInp_war); // War or expedition - cell_[67].appendChild(txtInp_infirm1910); // Infirmaties - xx = Blind (both eyes) Y/N/-, Deaf and Dumb Y/N/- + cell_[60].appendChild(txtInp_occu3); // Occupation_3 + cell_[61].appendChild(txtInp_ind2); // Industry ind_2 + cell_[62].appendChild(txtInp_emp2); // Employ_2 + //cell_[63].appendChild(txtInp_N_ality); // Nationality (UK 1911) - British, OR Naturalised, OR(French, German, Russian etc) + cell_[63].appendChild(txtInp_infirm); // Infirmaties - up to 5 parameters x--xx etc + cell_[64].appendChild(txtInp_situ); // Health Situation 1890 - Disease, Infimaties, Convict, Pauper etc + cell_[65].appendChild(txtInp_vet); // Veteran ? + cell_[66].appendChild(txtInp_war); // War or expedition + cell_[67].appendChild(txtInp_infirm1910); // Infirmaties - xx = Blind (both eyes) Y/N/-, Deaf and Dumb Y/N/- // Hidden Cells ======================================================= if (iteration > 0) { - cell_[68].appendChild(txtInp_DOB); // Date of Birth - cell_[69].appendChild(txtInp_DOM); // Date of Marriage - cell_[70].appendChild(txtInp_FullName); // Full Name - cell_[71].appendChild(txtInp_MarrName); // Married Name - cell_[72].appendChild(txtInp_DOD); // Date of Death - cell_[73].appendChild(txtInp_ChBLD); // Text Array - Children Born/Living/Died + cell_[68].appendChild(txtInp_DOB); // Date of Birth + cell_[69].appendChild(txtInp_DOM); // Date of Marriage + cell_[70].appendChild(txtInp_FullName); // Full Name + cell_[71].appendChild(txtInp_MarrName); // Married Name + cell_[72].appendChild(txtInp_DOD); // Date of Death + cell_[73].appendChild(txtInp_ChBLD); // Text Array - Children Born/Living/Died } // Extra Cells ======================================================== if (iteration == 0) { - cell_tdel.appendChild(txtInp_tdel); // Text Del - cell_tra.appendChild(txtInp_tra); // Text Ins + cell_tdel.appendChild(txtInp_tdel); // Text Del + cell_tra.appendChild(txtInp_tra); // Text Ins }else{ - cell_del.appendChild(btnEl); // Onclick = Delete Row - cell_ra.appendChild(raEl); // Radio button used for inserting a row, rather than adding at end of table) + cell_del.appendChild(btnEl); // Onclick = Delete Row + cell_ra.appendChild(raEl); // Radio button used for inserting a row, rather than adding at end of table) } - // cell_index2.appendChild(txt_itemNo2); // Text Item Number + // cell_index2.appendChild(txt_itemNo2); // Text Item Number // **F** Pass in the elements to be referenced later ================== // Store the myRow object in each row - row.myRow = new myRowObject( txt_itemNo, txtInp_pid, txtInp_nam, txtInp_label, txtInp_cond, txtInp_tenure, txtInp_assets, txtInp_age, txtInp_race, txtInp_gend, + row.myRow = new myRowObject( txt_itemNo, txtInp_pid, txtInp_nam, txtInp_label, txtInp_cond, txtInp_tenure, txtInp_assets, txtInp_age, txtInp_race, txtInp_gend, txtInp_race2, txtInp_yob, txtInp_age2, txtInp_bmth, txtInp_label2, txtInp_cond2, txtInp_yrsm, txtInp_chilB, txtInp_chilL, txtInp_chilD, txtInp_ageM, txtInp_occu, txtInp_assets2, txtInp_birthpl, txtInp_parent, txtInp_bmth2, txtInp_mmth, txtInp_ibirthpl, txtInp_fbirthpl, txtInp_mbirthpl, txtInp_yrsUS, txtInp_yoi1, txtInp_na1, txtInp_yon, txtInp_englang, txtInp_occu2, txtInp_health, txtInp_ind1, txtInp_emp1, txtInp_emR, @@ -2436,171 +2436,171 @@ function reorderRows(tbl, startingIndex) { var count = startingIndex + ROW_BASE; for (var i=startingIndex; i<tbl.tBodies[0].rows.length; i++) { // CONFIG: next line is affected by myRowObject settings - tbl.tBodies[0].rows[i].myRow.zero.data = count; // text - (left column item number) + tbl.tBodies[0].rows[i].myRow.zero.data = count; // text - (left column item number) // ------------------------------------------------------------ - tbl.tBodies[0].rows[i].myRow.one.id = INPUT_NAME_PREFIX + count + '_1'; // input text - tbl.tBodies[0].rows[i].myRow.two.id = INPUT_NAME_PREFIX + count + '_2'; // input text - tbl.tBodies[0].rows[i].myRow.three.id = INPUT_NAME_PREFIX + count + '_3'; // input text - tbl.tBodies[0].rows[i].myRow.four.id = INPUT_NAME_PREFIX + count + '_4'; // input text - tbl.tBodies[0].rows[i].myRow.five.id = INPUT_NAME_PREFIX + count + '_5'; // input text - tbl.tBodies[0].rows[i].myRow.six.id = INPUT_NAME_PREFIX + count + '_6'; // input text - tbl.tBodies[0].rows[i].myRow.seven.id = INPUT_NAME_PREFIX + count + '_7'; // input text - tbl.tBodies[0].rows[i].myRow.eight.id = INPUT_NAME_PREFIX + count + '_8'; // input text - tbl.tBodies[0].rows[i].myRow.nine.id = INPUT_NAME_PREFIX + count + '_9'; // input text + tbl.tBodies[0].rows[i].myRow.one.id = INPUT_NAME_PREFIX + count + '_1'; // input text + tbl.tBodies[0].rows[i].myRow.two.id = INPUT_NAME_PREFIX + count + '_2'; // input text + tbl.tBodies[0].rows[i].myRow.three.id = INPUT_NAME_PREFIX + count + '_3'; // input text + tbl.tBodies[0].rows[i].myRow.four.id = INPUT_NAME_PREFIX + count + '_4'; // input text + tbl.tBodies[0].rows[i].myRow.five.id = INPUT_NAME_PREFIX + count + '_5'; // input text + tbl.tBodies[0].rows[i].myRow.six.id = INPUT_NAME_PREFIX + count + '_6'; // input text + tbl.tBodies[0].rows[i].myRow.seven.id = INPUT_NAME_PREFIX + count + '_7'; // input text + tbl.tBodies[0].rows[i].myRow.eight.id = INPUT_NAME_PREFIX + count + '_8'; // input text + tbl.tBodies[0].rows[i].myRow.nine.id = INPUT_NAME_PREFIX + count + '_9'; // input text - tbl.tBodies[0].rows[i].myRow.ten.id = INPUT_NAME_PREFIX + count + '_10'; // input text - tbl.tBodies[0].rows[i].myRow.eleven.id = INPUT_NAME_PREFIX + count + '_11'; // input text - tbl.tBodies[0].rows[i].myRow.twelve.id = INPUT_NAME_PREFIX + count + '_12'; // input text - tbl.tBodies[0].rows[i].myRow.thirteen.id = INPUT_NAME_PREFIX + count + '_13'; // input text - tbl.tBodies[0].rows[i].myRow.fourteen.id = INPUT_NAME_PREFIX + count + '_14'; // input text - tbl.tBodies[0].rows[i].myRow.fifteen.id = INPUT_NAME_PREFIX + count + '_15'; // input text - tbl.tBodies[0].rows[i].myRow.sixteen.id = INPUT_NAME_PREFIX + count + '_16'; // input text - tbl.tBodies[0].rows[i].myRow.seventeen.id = INPUT_NAME_PREFIX + count + '_17'; // input text - tbl.tBodies[0].rows[i].myRow.eighteen.id = INPUT_NAME_PREFIX + count + '_18'; // input text - tbl.tBodies[0].rows[i].myRow.nineteen.id = INPUT_NAME_PREFIX + count + '_19'; // input text + tbl.tBodies[0].rows[i].myRow.ten.id = INPUT_NAME_PREFIX + count + '_10'; // input text + tbl.tBodies[0].rows[i].myRow.eleven.id = INPUT_NAME_PREFIX + count + '_11'; // input text + tbl.tBodies[0].rows[i].myRow.twelve.id = INPUT_NAME_PREFIX + count + '_12'; // input text + tbl.tBodies[0].rows[i].myRow.thirteen.id = INPUT_NAME_PREFIX + count + '_13'; // input text + tbl.tBodies[0].rows[i].myRow.fourteen.id = INPUT_NAME_PREFIX + count + '_14'; // input text + tbl.tBodies[0].rows[i].myRow.fifteen.id = INPUT_NAME_PREFIX + count + '_15'; // input text + tbl.tBodies[0].rows[i].myRow.sixteen.id = INPUT_NAME_PREFIX + count + '_16'; // input text + tbl.tBodies[0].rows[i].myRow.seventeen.id = INPUT_NAME_PREFIX + count + '_17'; // input text + tbl.tBodies[0].rows[i].myRow.eighteen.id = INPUT_NAME_PREFIX + count + '_18'; // input text + tbl.tBodies[0].rows[i].myRow.nineteen.id = INPUT_NAME_PREFIX + count + '_19'; // input text - tbl.tBodies[0].rows[i].myRow.twenty.id = INPUT_NAME_PREFIX + count + '_20'; // input text - tbl.tBodies[0].rows[i].myRow.twentyone.id = INPUT_NAME_PREFIX + count + '_21'; // input text - tbl.tBodies[0].rows[i].myRow.twentytwo.id = INPUT_NAME_PREFIX + count + '_22'; // input text - tbl.tBodies[0].rows[i].myRow.twentythree.id = INPUT_NAME_PREFIX + count + '_23'; // input text - tbl.tBodies[0].rows[i].myRow.twentyfour.id = INPUT_NAME_PREFIX + count + '_24'; // input text - tbl.tBodies[0].rows[i].myRow.twentyfive.id = INPUT_NAME_PREFIX + count + '_25'; // input text - tbl.tBodies[0].rows[i].myRow.twentysix.id = INPUT_NAME_PREFIX + count + '_26'; // input text - tbl.tBodies[0].rows[i].myRow.twentyseven.id = INPUT_NAME_PREFIX + count + '_27'; // input text - tbl.tBodies[0].rows[i].myRow.twentyeight.id = INPUT_NAME_PREFIX + count + '_28'; // input text - tbl.tBodies[0].rows[i].myRow.twentynine.id = INPUT_NAME_PREFIX + count + '_29'; // input text + tbl.tBodies[0].rows[i].myRow.twenty.id = INPUT_NAME_PREFIX + count + '_20'; // input text + tbl.tBodies[0].rows[i].myRow.twentyone.id = INPUT_NAME_PREFIX + count + '_21'; // input text + tbl.tBodies[0].rows[i].myRow.twentytwo.id = INPUT_NAME_PREFIX + count + '_22'; // input text + tbl.tBodies[0].rows[i].myRow.twentythree.id = INPUT_NAME_PREFIX + count + '_23'; // input text + tbl.tBodies[0].rows[i].myRow.twentyfour.id = INPUT_NAME_PREFIX + count + '_24'; // input text + tbl.tBodies[0].rows[i].myRow.twentyfive.id = INPUT_NAME_PREFIX + count + '_25'; // input text + tbl.tBodies[0].rows[i].myRow.twentysix.id = INPUT_NAME_PREFIX + count + '_26'; // input text + tbl.tBodies[0].rows[i].myRow.twentyseven.id = INPUT_NAME_PREFIX + count + '_27'; // input text + tbl.tBodies[0].rows[i].myRow.twentyeight.id = INPUT_NAME_PREFIX + count + '_28'; // input text + tbl.tBodies[0].rows[i].myRow.twentynine.id = INPUT_NAME_PREFIX + count + '_29'; // input text - tbl.tBodies[0].rows[i].myRow.thirty.id = INPUT_NAME_PREFIX + count + '_30'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyone.id = INPUT_NAME_PREFIX + count + '_31'; // input text - tbl.tBodies[0].rows[i].myRow.thirtytwo.id = INPUT_NAME_PREFIX + count + '_32'; // input text - tbl.tBodies[0].rows[i].myRow.thirtythree.id = INPUT_NAME_PREFIX + count + '_33'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyfour.id = INPUT_NAME_PREFIX + count + '_34'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyfive.id = INPUT_NAME_PREFIX + count + '_35'; // input text - tbl.tBodies[0].rows[i].myRow.thirtysix.id = INPUT_NAME_PREFIX + count + '_36'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyseven.id = INPUT_NAME_PREFIX + count + '_37'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyeight.id = INPUT_NAME_PREFIX + count + '_38'; // input text - tbl.tBodies[0].rows[i].myRow.thirtynine.id = INPUT_NAME_PREFIX + count + '_39'; // input text + tbl.tBodies[0].rows[i].myRow.thirty.id = INPUT_NAME_PREFIX + count + '_30'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyone.id = INPUT_NAME_PREFIX + count + '_31'; // input text + tbl.tBodies[0].rows[i].myRow.thirtytwo.id = INPUT_NAME_PREFIX + count + '_32'; // input text + tbl.tBodies[0].rows[i].myRow.thirtythree.id = INPUT_NAME_PREFIX + count + '_33'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyfour.id = INPUT_NAME_PREFIX + count + '_34'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyfive.id = INPUT_NAME_PREFIX + count + '_35'; // input text + tbl.tBodies[0].rows[i].myRow.thirtysix.id = INPUT_NAME_PREFIX + count + '_36'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyseven.id = INPUT_NAME_PREFIX + count + '_37'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyeight.id = INPUT_NAME_PREFIX + count + '_38'; // input text + tbl.tBodies[0].rows[i].myRow.thirtynine.id = INPUT_NAME_PREFIX + count + '_39'; // input text - tbl.tBodies[0].rows[i].myRow.forty.id = INPUT_NAME_PREFIX + count + '_40'; // input text - tbl.tBodies[0].rows[i].myRow.fortyone.id = INPUT_NAME_PREFIX + count + '_41'; // input text - tbl.tBodies[0].rows[i].myRow.fortytwo.id = INPUT_NAME_PREFIX + count + '_42'; // input text - tbl.tBodies[0].rows[i].myRow.fortythree.id = INPUT_NAME_PREFIX + count + '_43'; // input text - tbl.tBodies[0].rows[i].myRow.fortyfour.id = INPUT_NAME_PREFIX + count + '_44'; // input text - tbl.tBodies[0].rows[i].myRow.fortyfive.id = INPUT_NAME_PREFIX + count + '_45'; // input text - tbl.tBodies[0].rows[i].myRow.fortysix.id = INPUT_NAME_PREFIX + count + '_46'; // input text - tbl.tBodies[0].rows[i].myRow.fortyseven.id = INPUT_NAME_PREFIX + count + '_47'; // input text - tbl.tBodies[0].rows[i].myRow.fortyeight.id = INPUT_NAME_PREFIX + count + '_48'; // input text - tbl.tBodies[0].rows[i].myRow.fortynine.id = INPUT_NAME_PREFIX + count + '_49'; // input text + tbl.tBodies[0].rows[i].myRow.forty.id = INPUT_NAME_PREFIX + count + '_40'; // input text + tbl.tBodies[0].rows[i].myRow.fortyone.id = INPUT_NAME_PREFIX + count + '_41'; // input text + tbl.tBodies[0].rows[i].myRow.fortytwo.id = INPUT_NAME_PREFIX + count + '_42'; // input text + tbl.tBodies[0].rows[i].myRow.fortythree.id = INPUT_NAME_PREFIX + count + '_43'; // input text + tbl.tBodies[0].rows[i].myRow.fortyfour.id = INPUT_NAME_PREFIX + count + '_44'; // input text + tbl.tBodies[0].rows[i].myRow.fortyfive.id = INPUT_NAME_PREFIX + count + '_45'; // input text + tbl.tBodies[0].rows[i].myRow.fortysix.id = INPUT_NAME_PREFIX + count + '_46'; // input text + tbl.tBodies[0].rows[i].myRow.fortyseven.id = INPUT_NAME_PREFIX + count + '_47'; // input text + tbl.tBodies[0].rows[i].myRow.fortyeight.id = INPUT_NAME_PREFIX + count + '_48'; // input text + tbl.tBodies[0].rows[i].myRow.fortynine.id = INPUT_NAME_PREFIX + count + '_49'; // input text - tbl.tBodies[0].rows[i].myRow.fifty.id = INPUT_NAME_PREFIX + count + '_50'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyone.id = INPUT_NAME_PREFIX + count + '_51'; // input text - tbl.tBodies[0].rows[i].myRow.fiftytwo.id = INPUT_NAME_PREFIX + count + '_52'; // input text - tbl.tBodies[0].rows[i].myRow.fiftythree.id = INPUT_NAME_PREFIX + count + '_53'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyfour.id = INPUT_NAME_PREFIX + count + '_54'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyfive.id = INPUT_NAME_PREFIX + count + '_55'; // input text - tbl.tBodies[0].rows[i].myRow.fiftysix.id = INPUT_NAME_PREFIX + count + '_56'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyseven.id = INPUT_NAME_PREFIX + count + '_57'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyeight.id = INPUT_NAME_PREFIX + count + '_58'; // input text - tbl.tBodies[0].rows[i].myRow.fiftynine.id = INPUT_NAME_PREFIX + count + '_59'; // input text + tbl.tBodies[0].rows[i].myRow.fifty.id = INPUT_NAME_PREFIX + count + '_50'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyone.id = INPUT_NAME_PREFIX + count + '_51'; // input text + tbl.tBodies[0].rows[i].myRow.fiftytwo.id = INPUT_NAME_PREFIX + count + '_52'; // input text + tbl.tBodies[0].rows[i].myRow.fiftythree.id = INPUT_NAME_PREFIX + count + '_53'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyfour.id = INPUT_NAME_PREFIX + count + '_54'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyfive.id = INPUT_NAME_PREFIX + count + '_55'; // input text + tbl.tBodies[0].rows[i].myRow.fiftysix.id = INPUT_NAME_PREFIX + count + '_56'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyseven.id = INPUT_NAME_PREFIX + count + '_57'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyeight.id = INPUT_NAME_PREFIX + count + '_58'; // input text + tbl.tBodies[0].rows[i].myRow.fiftynine.id = INPUT_NAME_PREFIX + count + '_59'; // input text - tbl.tBodies[0].rows[i].myRow.sixty.id = INPUT_NAME_PREFIX + count + '_60'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyone.id = INPUT_NAME_PREFIX + count + '_61'; // input text - tbl.tBodies[0].rows[i].myRow.sixtytwo.id = INPUT_NAME_PREFIX + count + '_62'; // input text - tbl.tBodies[0].rows[i].myRow.sixtythree.id = INPUT_NAME_PREFIX + count + '_63'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyfour.id = INPUT_NAME_PREFIX + count + '_64'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyfive.id = INPUT_NAME_PREFIX + count + '_65'; // input text - tbl.tBodies[0].rows[i].myRow.sixtysix.id = INPUT_NAME_PREFIX + count + '_66'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyseven.id = INPUT_NAME_PREFIX + count + '_67'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyeight.id = INPUT_NAME_PREFIX + count + '_68'; // input text - tbl.tBodies[0].rows[i].myRow.sixtynine.id = INPUT_NAME_PREFIX + count + '_69'; // input text - tbl.tBodies[0].rows[i].myRow.seventy.id = INPUT_NAME_PREFIX + count + '_70'; // input text - tbl.tBodies[0].rows[i].myRow.seventyone.id = INPUT_NAME_PREFIX + count + '_71'; // input text - tbl.tBodies[0].rows[i].myRow.seventytwo.id = INPUT_NAME_PREFIX + count + '_72'; // input text - tbl.tBodies[0].rows[i].myRow.seventythree.id = INPUT_NAME_PREFIX + count + '_73'; // input text + tbl.tBodies[0].rows[i].myRow.sixty.id = INPUT_NAME_PREFIX + count + '_60'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyone.id = INPUT_NAME_PREFIX + count + '_61'; // input text + tbl.tBodies[0].rows[i].myRow.sixtytwo.id = INPUT_NAME_PREFIX + count + '_62'; // input text + tbl.tBodies[0].rows[i].myRow.sixtythree.id = INPUT_NAME_PREFIX + count + '_63'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyfour.id = INPUT_NAME_PREFIX + count + '_64'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyfive.id = INPUT_NAME_PREFIX + count + '_65'; // input text + tbl.tBodies[0].rows[i].myRow.sixtysix.id = INPUT_NAME_PREFIX + count + '_66'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyseven.id = INPUT_NAME_PREFIX + count + '_67'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyeight.id = INPUT_NAME_PREFIX + count + '_68'; // input text + tbl.tBodies[0].rows[i].myRow.sixtynine.id = INPUT_NAME_PREFIX + count + '_69'; // input text + tbl.tBodies[0].rows[i].myRow.seventy.id = INPUT_NAME_PREFIX + count + '_70'; // input text + tbl.tBodies[0].rows[i].myRow.seventyone.id = INPUT_NAME_PREFIX + count + '_71'; // input text + tbl.tBodies[0].rows[i].myRow.seventytwo.id = INPUT_NAME_PREFIX + count + '_72'; // input text + tbl.tBodies[0].rows[i].myRow.seventythree.id = INPUT_NAME_PREFIX + count + '_73'; // input text // ------------------------------------------------------------ // ------------------------------------------------------------ - tbl.tBodies[0].rows[i].myRow.one.name = INPUT_NAME_PREFIX + count + '_1'; // input text - tbl.tBodies[0].rows[i].myRow.two.name = INPUT_NAME_PREFIX + count + '_2'; // input text - tbl.tBodies[0].rows[i].myRow.three.name = INPUT_NAME_PREFIX + count + '_3'; // input text - tbl.tBodies[0].rows[i].myRow.four.name = INPUT_NAME_PREFIX + count + '_4'; // input text - tbl.tBodies[0].rows[i].myRow.five.name = INPUT_NAME_PREFIX + count + '_5'; // input text - tbl.tBodies[0].rows[i].myRow.six.name = INPUT_NAME_PREFIX + count + '_6'; // input text - tbl.tBodies[0].rows[i].myRow.seven.name = INPUT_NAME_PREFIX + count + '_7'; // input text - tbl.tBodies[0].rows[i].myRow.eight.name = INPUT_NAME_PREFIX + count + '_8'; // input text - tbl.tBodies[0].rows[i].myRow.nine.name = INPUT_NAME_PREFIX + count + '_9'; // input text + tbl.tBodies[0].rows[i].myRow.one.name = INPUT_NAME_PREFIX + count + '_1'; // input text + tbl.tBodies[0].rows[i].myRow.two.name = INPUT_NAME_PREFIX + count + '_2'; // input text + tbl.tBodies[0].rows[i].myRow.three.name = INPUT_NAME_PREFIX + count + '_3'; // input text + tbl.tBodies[0].rows[i].myRow.four.name = INPUT_NAME_PREFIX + count + '_4'; // input text + tbl.tBodies[0].rows[i].myRow.five.name = INPUT_NAME_PREFIX + count + '_5'; // input text + tbl.tBodies[0].rows[i].myRow.six.name = INPUT_NAME_PREFIX + count + '_6'; // input text + tbl.tBodies[0].rows[i].myRow.seven.name = INPUT_NAME_PREFIX + count + '_7'; // input text + tbl.tBodies[0].rows[i].myRow.eight.name = INPUT_NAME_PREFIX + count + '_8'; // input text + tbl.tBodies[0].rows[i].myRow.nine.name = INPUT_NAME_PREFIX + count + '_9'; // input text - tbl.tBodies[0].rows[i].myRow.ten.name = INPUT_NAME_PREFIX + count + '_10'; // input text - tbl.tBodies[0].rows[i].myRow.eleven.name = INPUT_NAME_PREFIX + count + '_11'; // input text - tbl.tBodies[0].rows[i].myRow.twelve.name = INPUT_NAME_PREFIX + count + '_12'; // input text - tbl.tBodies[0].rows[i].myRow.thirteen.name = INPUT_NAME_PREFIX + count + '_13'; // input text - tbl.tBodies[0].rows[i].myRow.fourteen.name = INPUT_NAME_PREFIX + count + '_14'; // input text - tbl.tBodies[0].rows[i].myRow.fifteen.name = INPUT_NAME_PREFIX + count + '_15'; // input text - tbl.tBodies[0].rows[i].myRow.sixteen.name = INPUT_NAME_PREFIX + count + '_16'; // input text - tbl.tBodies[0].rows[i].myRow.seventeen.name = INPUT_NAME_PREFIX + count + '_17'; // input text - tbl.tBodies[0].rows[i].myRow.eighteen.name = INPUT_NAME_PREFIX + count + '_18'; // input text - tbl.tBodies[0].rows[i].myRow.nineteen.name = INPUT_NAME_PREFIX + count + '_19'; // input text + tbl.tBodies[0].rows[i].myRow.ten.name = INPUT_NAME_PREFIX + count + '_10'; // input text + tbl.tBodies[0].rows[i].myRow.eleven.name = INPUT_NAME_PREFIX + count + '_11'; // input text + tbl.tBodies[0].rows[i].myRow.twelve.name = INPUT_NAME_PREFIX + count + '_12'; // input text + tbl.tBodies[0].rows[i].myRow.thirteen.name = INPUT_NAME_PREFIX + count + '_13'; // input text + tbl.tBodies[0].rows[i].myRow.fourteen.name = INPUT_NAME_PREFIX + count + '_14'; // input text + tbl.tBodies[0].rows[i].myRow.fifteen.name = INPUT_NAME_PREFIX + count + '_15'; // input text + tbl.tBodies[0].rows[i].myRow.sixteen.name = INPUT_NAME_PREFIX + count + '_16'; // input text + tbl.tBodies[0].rows[i].myRow.seventeen.name = INPUT_NAME_PREFIX + count + '_17'; // input text + tbl.tBodies[0].rows[i].myRow.eighteen.name = INPUT_NAME_PREFIX + count + '_18'; // input text + tbl.tBodies[0].rows[i].myRow.nineteen.name = INPUT_NAME_PREFIX + count + '_19'; // input text - tbl.tBodies[0].rows[i].myRow.twenty.name = INPUT_NAME_PREFIX + count + '_20'; // input text - tbl.tBodies[0].rows[i].myRow.twentyone.name = INPUT_NAME_PREFIX + count + '_21'; // input text - tbl.tBodies[0].rows[i].myRow.twentytwo.name = INPUT_NAME_PREFIX + count + '_22'; // input text - tbl.tBodies[0].rows[i].myRow.twentythree.name = INPUT_NAME_PREFIX + count + '_23'; // input text - tbl.tBodies[0].rows[i].myRow.twentyfour.name = INPUT_NAME_PREFIX + count + '_24'; // input text - tbl.tBodies[0].rows[i].myRow.twentyfive.name = INPUT_NAME_PREFIX + count + '_25'; // input text - tbl.tBodies[0].rows[i].myRow.twentysix.name = INPUT_NAME_PREFIX + count + '_26'; // input text - tbl.tBodies[0].rows[i].myRow.twentyseven.name = INPUT_NAME_PREFIX + count + '_27'; // input text - tbl.tBodies[0].rows[i].myRow.twentyeight.name = INPUT_NAME_PREFIX + count + '_28'; // input text - tbl.tBodies[0].rows[i].myRow.twentynine.name = INPUT_NAME_PREFIX + count + '_29'; // input text + tbl.tBodies[0].rows[i].myRow.twenty.name = INPUT_NAME_PREFIX + count + '_20'; // input text + tbl.tBodies[0].rows[i].myRow.twentyone.name = INPUT_NAME_PREFIX + count + '_21'; // input text + tbl.tBodies[0].rows[i].myRow.twentytwo.name = INPUT_NAME_PREFIX + count + '_22'; // input text + tbl.tBodies[0].rows[i].myRow.twentythree.name = INPUT_NAME_PREFIX + count + '_23'; // input text + tbl.tBodies[0].rows[i].myRow.twentyfour.name = INPUT_NAME_PREFIX + count + '_24'; // input text + tbl.tBodies[0].rows[i].myRow.twentyfive.name = INPUT_NAME_PREFIX + count + '_25'; // input text + tbl.tBodies[0].rows[i].myRow.twentysix.name = INPUT_NAME_PREFIX + count + '_26'; // input text + tbl.tBodies[0].rows[i].myRow.twentyseven.name = INPUT_NAME_PREFIX + count + '_27'; // input text + tbl.tBodies[0].rows[i].myRow.twentyeight.name = INPUT_NAME_PREFIX + count + '_28'; // input text + tbl.tBodies[0].rows[i].myRow.twentynine.name = INPUT_NAME_PREFIX + count + '_29'; // input text - tbl.tBodies[0].rows[i].myRow.thirty.name = INPUT_NAME_PREFIX + count + '_30'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyone.name = INPUT_NAME_PREFIX + count + '_31'; // input text - tbl.tBodies[0].rows[i].myRow.thirtytwo.name = INPUT_NAME_PREFIX + count + '_32'; // input text - tbl.tBodies[0].rows[i].myRow.thirtythree.name = INPUT_NAME_PREFIX + count + '_33'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyfour.name = INPUT_NAME_PREFIX + count + '_34'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyfive.name = INPUT_NAME_PREFIX + count + '_35'; // input text - tbl.tBodies[0].rows[i].myRow.thirtysix.name = INPUT_NAME_PREFIX + count + '_36'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyseven.name = INPUT_NAME_PREFIX + count + '_37'; // input text - tbl.tBodies[0].rows[i].myRow.thirtyeight.name = INPUT_NAME_PREFIX + count + '_38'; // input text - tbl.tBodies[0].rows[i].myRow.thirtynine.name = INPUT_NAME_PREFIX + count + '_39'; // input text + tbl.tBodies[0].rows[i].myRow.thirty.name = INPUT_NAME_PREFIX + count + '_30'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyone.name = INPUT_NAME_PREFIX + count + '_31'; // input text + tbl.tBodies[0].rows[i].myRow.thirtytwo.name = INPUT_NAME_PREFIX + count + '_32'; // input text + tbl.tBodies[0].rows[i].myRow.thirtythree.name = INPUT_NAME_PREFIX + count + '_33'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyfour.name = INPUT_NAME_PREFIX + count + '_34'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyfive.name = INPUT_NAME_PREFIX + count + '_35'; // input text + tbl.tBodies[0].rows[i].myRow.thirtysix.name = INPUT_NAME_PREFIX + count + '_36'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyseven.name = INPUT_NAME_PREFIX + count + '_37'; // input text + tbl.tBodies[0].rows[i].myRow.thirtyeight.name = INPUT_NAME_PREFIX + count + '_38'; // input text + tbl.tBodies[0].rows[i].myRow.thirtynine.name = INPUT_NAME_PREFIX + count + '_39'; // input text - tbl.tBodies[0].rows[i].myRow.forty.name = INPUT_NAME_PREFIX + count + '_40'; // input text - tbl.tBodies[0].rows[i].myRow.fortyone.name = INPUT_NAME_PREFIX + count + '_41'; // input text - tbl.tBodies[0].rows[i].myRow.fortytwo.name = INPUT_NAME_PREFIX + count + '_42'; // input text - tbl.tBodies[0].rows[i].myRow.fortythree.name = INPUT_NAME_PREFIX + count + '_43'; // input text - tbl.tBodies[0].rows[i].myRow.fortyfour.name = INPUT_NAME_PREFIX + count + '_44'; // input text - tbl.tBodies[0].rows[i].myRow.fortyfive.name = INPUT_NAME_PREFIX + count + '_45'; // input text - tbl.tBodies[0].rows[i].myRow.fortysix.name = INPUT_NAME_PREFIX + count + '_46'; // input text - tbl.tBodies[0].rows[i].myRow.fortyseven.name = INPUT_NAME_PREFIX + count + '_47'; // input text - tbl.tBodies[0].rows[i].myRow.fortyeight.name = INPUT_NAME_PREFIX + count + '_48'; // input text - tbl.tBodies[0].rows[i].myRow.fortynine.name = INPUT_NAME_PREFIX + count + '_49'; // input text + tbl.tBodies[0].rows[i].myRow.forty.name = INPUT_NAME_PREFIX + count + '_40'; // input text + tbl.tBodies[0].rows[i].myRow.fortyone.name = INPUT_NAME_PREFIX + count + '_41'; // input text + tbl.tBodies[0].rows[i].myRow.fortytwo.name = INPUT_NAME_PREFIX + count + '_42'; // input text + tbl.tBodies[0].rows[i].myRow.fortythree.name = INPUT_NAME_PREFIX + count + '_43'; // input text + tbl.tBodies[0].rows[i].myRow.fortyfour.name = INPUT_NAME_PREFIX + count + '_44'; // input text + tbl.tBodies[0].rows[i].myRow.fortyfive.name = INPUT_NAME_PREFIX + count + '_45'; // input text + tbl.tBodies[0].rows[i].myRow.fortysix.name = INPUT_NAME_PREFIX + count + '_46'; // input text + tbl.tBodies[0].rows[i].myRow.fortyseven.name = INPUT_NAME_PREFIX + count + '_47'; // input text + tbl.tBodies[0].rows[i].myRow.fortyeight.name = INPUT_NAME_PREFIX + count + '_48'; // input text + tbl.tBodies[0].rows[i].myRow.fortynine.name = INPUT_NAME_PREFIX + count + '_49'; // input text - tbl.tBodies[0].rows[i].myRow.fifty.name = INPUT_NAME_PREFIX + count + '_50'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyone.name = INPUT_NAME_PREFIX + count + '_51'; // input text - tbl.tBodies[0].rows[i].myRow.fiftytwo.name = INPUT_NAME_PREFIX + count + '_52'; // input text - tbl.tBodies[0].rows[i].myRow.fiftythree.name = INPUT_NAME_PREFIX + count + '_53'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyfour.name = INPUT_NAME_PREFIX + count + '_54'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyfive.name = INPUT_NAME_PREFIX + count + '_55'; // input text - tbl.tBodies[0].rows[i].myRow.fiftysix.name = INPUT_NAME_PREFIX + count + '_56'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyseven.name = INPUT_NAME_PREFIX + count + '_57'; // input text - tbl.tBodies[0].rows[i].myRow.fiftyeight.name = INPUT_NAME_PREFIX + count + '_58'; // input text - tbl.tBodies[0].rows[i].myRow.fiftynine.name = INPUT_NAME_PREFIX + count + '_59'; // input text + tbl.tBodies[0].rows[i].myRow.fifty.name = INPUT_NAME_PREFIX + count + '_50'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyone.name = INPUT_NAME_PREFIX + count + '_51'; // input text + tbl.tBodies[0].rows[i].myRow.fiftytwo.name = INPUT_NAME_PREFIX + count + '_52'; // input text + tbl.tBodies[0].rows[i].myRow.fiftythree.name = INPUT_NAME_PREFIX + count + '_53'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyfour.name = INPUT_NAME_PREFIX + count + '_54'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyfive.name = INPUT_NAME_PREFIX + count + '_55'; // input text + tbl.tBodies[0].rows[i].myRow.fiftysix.name = INPUT_NAME_PREFIX + count + '_56'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyseven.name = INPUT_NAME_PREFIX + count + '_57'; // input text + tbl.tBodies[0].rows[i].myRow.fiftyeight.name = INPUT_NAME_PREFIX + count + '_58'; // input text + tbl.tBodies[0].rows[i].myRow.fiftynine.name = INPUT_NAME_PREFIX + count + '_59'; // input text - tbl.tBodies[0].rows[i].myRow.sixty.name = INPUT_NAME_PREFIX + count + '_60'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyone.name = INPUT_NAME_PREFIX + count + '_61'; // input text - tbl.tBodies[0].rows[i].myRow.sixtytwo.name = INPUT_NAME_PREFIX + count + '_62'; // input text - tbl.tBodies[0].rows[i].myRow.sixtythree.name = INPUT_NAME_PREFIX + count + '_63'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyfour.name = INPUT_NAME_PREFIX + count + '_64'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyfive.name = INPUT_NAME_PREFIX + count + '_65'; // input text - tbl.tBodies[0].rows[i].myRow.sixtysix.name = INPUT_NAME_PREFIX + count + '_66'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyseven.name = INPUT_NAME_PREFIX + count + '_67'; // input text - tbl.tBodies[0].rows[i].myRow.sixtyeight.name = INPUT_NAME_PREFIX + count + '_68'; // input text - tbl.tBodies[0].rows[i].myRow.sixtynine.name = INPUT_NAME_PREFIX + count + '_69'; // input text + tbl.tBodies[0].rows[i].myRow.sixty.name = INPUT_NAME_PREFIX + count + '_60'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyone.name = INPUT_NAME_PREFIX + count + '_61'; // input text + tbl.tBodies[0].rows[i].myRow.sixtytwo.name = INPUT_NAME_PREFIX + count + '_62'; // input text + tbl.tBodies[0].rows[i].myRow.sixtythree.name = INPUT_NAME_PREFIX + count + '_63'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyfour.name = INPUT_NAME_PREFIX + count + '_64'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyfive.name = INPUT_NAME_PREFIX + count + '_65'; // input text + tbl.tBodies[0].rows[i].myRow.sixtysix.name = INPUT_NAME_PREFIX + count + '_66'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyseven.name = INPUT_NAME_PREFIX + count + '_67'; // input text + tbl.tBodies[0].rows[i].myRow.sixtyeight.name = INPUT_NAME_PREFIX + count + '_68'; // input text + tbl.tBodies[0].rows[i].myRow.sixtynine.name = INPUT_NAME_PREFIX + count + '_69'; // input text - tbl.tBodies[0].rows[i].myRow.seventy.name = INPUT_NAME_PREFIX + count + '_70'; // input text - tbl.tBodies[0].rows[i].myRow.seventyone.name = INPUT_NAME_PREFIX + count + '_71'; // input text - tbl.tBodies[0].rows[i].myRow.seventytwo.name = INPUT_NAME_PREFIX + count + '_72'; // input text - tbl.tBodies[0].rows[i].myRow.seventythree.name = INPUT_NAME_PREFIX + count + '_73'; // input text + tbl.tBodies[0].rows[i].myRow.seventy.name = INPUT_NAME_PREFIX + count + '_70'; // input text + tbl.tBodies[0].rows[i].myRow.seventyone.name = INPUT_NAME_PREFIX + count + '_71'; // input text + tbl.tBodies[0].rows[i].myRow.seventytwo.name = INPUT_NAME_PREFIX + count + '_72'; // input text + tbl.tBodies[0].rows[i].myRow.seventythree.name = INPUT_NAME_PREFIX + count + '_73'; // input text // ------------------------------------------------------------ tbl.tBodies[0].rows[i].myRow.ra.value = count; // input radio @@ -2611,6 +2611,3 @@ function reorderRows(tbl, startingIndex) { } </script> - - - diff --git a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php index 4ae7d9f243..9f0f63a1b6 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php +++ b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php @@ -32,10 +32,10 @@ // GEDFact Media assistant replacement code for inverselink.php: =========================== //-- extra page parameters and checking -$more_links = safe_REQUEST($_REQUEST, 'more_links', WT_REGEX_UNSAFE); -$exist_links = safe_REQUEST($_REQUEST, 'exist_links', WT_REGEX_UNSAFE); -$gid = safe_GET_xref('gid'); -$update_CHAN = safe_REQUEST($_REQUEST, 'preserve_last_changed', WT_REGEX_UNSAFE); +$more_links = safe_REQUEST($_REQUEST, 'more_links', WT_REGEX_UNSAFE); +$exist_links = safe_REQUEST($_REQUEST, 'exist_links', WT_REGEX_UNSAFE); +$gid = safe_GET_xref('gid'); +$update_CHAN = safe_REQUEST($_REQUEST, 'preserve_last_changed', WT_REGEX_UNSAFE); if (empty($linktoid) || empty($linkto)) { @@ -111,7 +111,7 @@ if ($action == "choose" && $paramok) { //--> </script> <script src="webtrees.js" language="JavaScript" type="text/javascript"></script> - <link href ="modules/GEDFact_assistant/css/media_0_inverselink.css" rel="stylesheet" type="text/css" media="screen" /> + <link href ="modules/GEDFact_assistant/css/media_0_inverselink.css" rel="stylesheet" type="text/css" media="screen" /> <?php echo '<form name="link" method="get" action="inverselink.php">'; @@ -268,8 +268,8 @@ if ($action == "choose" && $paramok) { }else if ($more_links==",") { // echo nothing and do nothing }else{ - // echo $mediaid, $pgv_lang["media_now_linked to"], '(', $gid, ')<br />'; - // linkMedia($mediaid, $gid); + //echo $mediaid, $pgv_lang["media_now_linked to"], '(', $gid, ')<br />'; + //linkMedia($mediaid, $gid); } if ($update_CHAN=='no_change') { @@ -285,5 +285,3 @@ if ($action == "choose" && $paramok) { echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close();">', i18n::translate('Close Window'), '</a><br /></center>'; //print_simple_footer(); } - -?> diff --git a/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php b/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php index 7d4bc4e89e..8a19f85d98 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php +++ b/modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php @@ -73,9 +73,9 @@ if ($pid=="") { echo '<b>', i18n::translate('Family Navigator'), '</b>'; echo '</td></tr>'; echo '<tr>'; -// echo '<td class="optionbox wrap" valign="top" align="left" width="50%" >'; -// echo i18n::translate('Add Family, and Search links'); -// echo '</td>'; + //echo '<td class="optionbox wrap" valign="top" align="left" width="50%" >'; + //echo i18n::translate('Add Family, and Search links'); + //echo '</td>'; echo '<td valign="top" width=400>'; //-- Search and Add Family Members Area ========================================= include('modules/GEDFact_assistant/_MEDIA/media_3_search_add.php'); @@ -83,8 +83,4 @@ if ($pid=="") { echo '</tr>'; echo '</table>'; -} // End IF test for Base pid - -?> - - +} // End IF test for Base pid diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_find.php b/modules/GEDFact_assistant/_MEDIA/media_3_find.php index b026b97f13..7bb6b7f5bc 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_3_find.php +++ b/modules/GEDFact_assistant/_MEDIA/media_3_find.php @@ -46,7 +46,7 @@ $directory =safe_GET('directory', WT_REGEX_NOSCRIPT, $MEDIA_DIRECTORY); $multiple =safe_GET_bool('multiple'); $showthumb =safe_GET_bool('showthumb'); $all =safe_GET_bool('all'); -$subclick =safe_GET('subclick'); +$subclick =safe_GET('subclick'); $choose =safe_GET('choose', WT_REGEX_NOSCRIPT, '0all'); $level =safe_GET('level', WT_REGEX_INTEGER, 0); $language_filter=safe_GET('language_filter'); @@ -439,7 +439,7 @@ if ($action=="filter") { echo "<td class=\"list_value_wrap $TEXT_DIRECTION\"><ul>"; usort($myindilist, array('GedcomRecord', 'Compare')); foreach($myindilist as $indi) { -// echo $indi->format_list('li', true); + //echo $indi->format_list('li', true); $nam = htmlspecialchars($indi->getFullName()); echo "<li><a href=\"javascript:;\" onclick=\"pasterow( '".$indi->getXref()."' , @@ -803,5 +803,3 @@ echo "</div>"; // Close div that centers table echo WT_JS_START, 'document.filter', $type, '.filter.focus();', WT_JS_END; print_simple_footer(); - -?> diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php index 079a39e9d3..de774724ea 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php +++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php @@ -161,32 +161,32 @@ if (!defined('WT_WEBTREES')) { if ( ($people["husb"]->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print PrintReady($people["husb"]->getXref()) ; // pid = PID + print PrintReady($people["husb"]->getXref()) ; // pid = PID ?>", "<?php - // print PrintReady($people["husb"]->getFullName()); // nam = Name + // print PrintReady($people["husb"]->getFullName()); // nam = Name echo PrintReady($fulln); ?>", "<?php - print PrintReady($people["husb"]->getLabel()); // label = Relationship + print PrintReady($people["husb"]->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($people["husb"]->getSex()); // gend = Gender + print PrintReady($people["husb"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php - print PrintReady($people["husb"]->getbirthyear()); // yob = Year of Birth + print PrintReady($people["husb"]->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["husb"]->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($people["husb"]->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'><?php - print PrintReady($people["husb"]->getFullName()); // Name + print PrintReady($people["husb"]->getFullName()); // Name ?> </a> <?php print "\n" ; @@ -244,38 +244,38 @@ if (!defined('WT_WEBTREES')) { <a href='javaScript:opener.insertRowToTable("<?php print $people["wife"]->getXref() ; // pid = PID ?>", "<?php - // if ($married>=0 && isset($nam[1])){ - // echo PrintReady($fulmn); // nam = Married Name - // }else{ - //print PrintReady($people["wife"]->getFullName()); // nam = Name + // if ($married>=0 && isset($nam[1])){ + // echo PrintReady($fulmn); // nam = Married Name + // }else{ + //print PrintReady($people["wife"]->getFullName()); // nam = Name echo PrintReady($fulln); - // } + // } ?>", "<?php - print PrintReady($people["wife"]->getLabel()); // label = Relationship + print PrintReady($people["wife"]->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($people["wife"]->getSex()); // gend = Gender + print PrintReady($people["wife"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0 && isset($nam[1])){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php - print PrintReady($people["wife"]->getbirthyear()); // yob = Year of Birth + print PrintReady($people["wife"]->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["wife"]->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($people["wife"]->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'> <?php //if ($married>=0 && isset($nam[1])){ - // print PrintReady($fulmn); // Full Married Name + // print PrintReady($fulmn); // Full Married Name //} else { - print PrintReady($people["wife"]->getFullName()); // Full Name + print PrintReady($people["wife"]->getFullName()); // Full Name //} ?> </a> @@ -346,46 +346,46 @@ if (!defined('WT_WEBTREES')) { if ( ($child->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print $child->getXref() ; // pid = PID + print $child->getXref() ; // pid = PID ?>", "<?php //if ($married>=0 && isset($nam[1])){ - // echo PrintReady($fulmn); // nam = Married Name + // echo PrintReady($fulmn); // nam = Married Name //}else{ - //print PrintReady($child->getFullName()); // nam = Full Name + //print PrintReady($child->getFullName()); // nam = Full Name echo PrintReady($fulln); //} ?>", "<?php if ($child->getXref()==$pid) { - print "Head"; // label = Head + print "Head"; // label = Head }else{ - print PrintReady($child->getLabel()); // label = Relationship + print PrintReady($child->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($child->getSex()); // gend = Gender + print PrintReady($child->getSex()); // gend = Gender ?>", "<?php if ($married>0) { - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) } else if ($married<0 || ($married=="0") ) { - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } else { - echo ""; // cond = Condition (Not Known) + echo ""; // cond = Condition (Not Known) } ?>", "<?php - print PrintReady($child->getbirthyear()); // yob = Year of Birth + print PrintReady($child->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'><?php - // if ($married>=0 && isset($nam[1])){ - // print PrintReady($fulmn); // Full Married Name - // } else { - print PrintReady($child->getFullName()); // Full Name - // } + // if ($married>=0 && isset($nam[1])){ + // print PrintReady($fulmn); // Full Married Name + // } else { + print PrintReady($child->getFullName()); // Full Name + // } ?> </a> <?php print "\n" ; @@ -460,36 +460,36 @@ if (!defined('WT_WEBTREES')) { if ( ($people["husb"]->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print PrintReady($people["husb"]->getXref()) ; // pid = PID + print PrintReady($people["husb"]->getXref()) ; // pid = PID ?>", "<?php - //print PrintReady($people["husb"]->getFullName()); // nam = Name + //print PrintReady($people["husb"]->getFullName()); // nam = Name echo PrintReady($fulln); ?>", "<?php if ($people["husb"]->getLabel() == ".") { - print PrintReady(i18n::translate('Step-Father')); // label = Relationship + print PrintReady(i18n::translate('Step-Father')); // label = Relationship }else{ - print PrintReady($people["husb"]->getLabel()); // label = Relationship + print PrintReady($people["husb"]->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($people["husb"]->getSex()); // gend = Gender + print PrintReady($people["husb"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php - print PrintReady($people["husb"]->getbirthyear()); // yob = Year of Birth + print PrintReady($people["husb"]->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["husb"]->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($people["husb"]->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'> - <?php print PrintReady($people["husb"]->getFullName()); // Name + <?php print PrintReady($people["husb"]->getFullName()); // Name ?> </a> <?php print "\n" ; @@ -551,44 +551,44 @@ if (!defined('WT_WEBTREES')) { if ( ($people["wife"]->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print PrintReady($people["wife"]->getXref()) ; // pid = PID + print PrintReady($people["wife"]->getXref()) ; // pid = PID ?>", "<?php - // if ($married>=0 && isset($nam[1])){ - // echo PrintReady($fulmn); // nam = Married Name - // }else{ - //print PrintReady($people["wife"]->getFullName()); // nam = Full Name + // if ($married>=0 && isset($nam[1])){ + // echo PrintReady($fulmn); // nam = Married Name + // }else{ + //print PrintReady($people["wife"]->getFullName()); // nam = Full Name echo PrintReady($fulln); - // } + // } ?>", "<?php if ($people["wife"]->getLabel() == ".") { - print PrintReady(i18n::translate('Step-Mother')); // label = Relationship + print PrintReady(i18n::translate('Step-Mother')); // label = Relationship }else{ - print PrintReady($people["wife"]->getLabel()); // label = Relationship + print PrintReady($people["wife"]->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($people["wife"]->getSex()); // gend = Gender + print PrintReady($people["wife"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0 && isset($nam[1])){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php - print PrintReady($people["wife"]->getbirthyear()); // yob = Year of Birth + print PrintReady($people["wife"]->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["wife"]->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($people["wife"]->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'> <?php //if ($married>=0 && isset($nam[1])){ - // print PrintReady($fulmn); // Full Married Name + // print PrintReady($fulmn); // Full Married Name //} else { - print PrintReady($people["wife"]->getFullName()); // Full Name + print PrintReady($people["wife"]->getFullName()); // Full Name //} ?> </a> @@ -621,7 +621,7 @@ if (!defined('WT_WEBTREES')) { $slabel = print_pedigree_person_nav2($child->getXref(), 2, 0, $personcount++, $currpid, $censyear); $slabel .= $spouselinks; $submenu = new Menu($slabel); - $menu->addSubMenu($submenu); if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($child->getDeathYear()); } + $menu->addSubMenu($submenu); if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($child->getDeathYear()); } if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($child->getBirthYear()); } ?> <tr> @@ -645,28 +645,28 @@ if (!defined('WT_WEBTREES')) { if ( ($child->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print PrintReady($child->getXref()) ; // pid = PID + print PrintReady($child->getXref()) ; // pid = PID ?>", "<?php - //print PrintReady($child->getFullName()); // nam = Name + //print PrintReady($child->getFullName()); // nam = Name echo PrintReady($fulln); ?>", "<?php - print PrintReady($child->getLabel()); // label = Relationship + print PrintReady($child->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($child->getSex()); // gend = Gender + print PrintReady($child->getSex()); // gend = Gender ?>", "<?php - print ""; // cond = Condition (Married or Single) + print ""; // cond = Condition (Married or Single) ?>", "<?php - print PrintReady($child->getbirthyear()); // yob = Year of Birth + print PrintReady($child->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'> - <?php print PrintReady($child->getFullName()); // Name + <?php print PrintReady($child->getFullName()); // Name ?> </a> <?php print "\n" ; @@ -744,37 +744,37 @@ if (!defined('WT_WEBTREES')) { if ( ($people["husb"]->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print $people["husb"]->getXref() ; // pid = PID + print $people["husb"]->getXref() ; // pid = PID ?>", "<?php - //print PrintReady($people["husb"]->getFullName()); // nam = Name + //print PrintReady($people["husb"]->getFullName()); // nam = Name echo PrintReady($fulln); ?>", "<?php if ($people["husb"]->getXref()==$pid) { - print "Head"; // label = Relationship + print "Head"; // label = Relationship }else{ - print $people["husb"]->getLabel(); // label = Relationship + print $people["husb"]->getLabel(); // label = Relationship } ?>", "<?php - print PrintReady($people["husb"]->getSex()); // gend = Gender + print PrintReady($people["husb"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php - print PrintReady($people["husb"]->getbirthyear()); // yob = Year of Birth + print PrintReady($people["husb"]->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["husb"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["husb"]->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($people["husb"]->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'> <?php - print PrintReady($people["husb"]->getFullName()); // Name + print PrintReady($people["husb"]->getFullName()); // Name ?> </a> <?php print "\n" ; @@ -840,44 +840,44 @@ if (!defined('WT_WEBTREES')) { if ( ($people["wife"]->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print $people["wife"]->getXref() ; // pid = PID + print $people["wife"]->getXref() ; // pid = PID ?>", "<?php - // if ($married>=0 && isset($nam[1])){ - // echo PrintReady($fulmn); // nam = Full Married Name - // }else{ - //print PrintReady($people["wife"]->getFullName()); // nam = Full Name + // if ($married>=0 && isset($nam[1])){ + // echo PrintReady($fulmn); // nam = Full Married Name + // }else{ + //print PrintReady($people["wife"]->getFullName()); // nam = Full Name echo PrintReady($fulln); - // } + // } ?>", "<?php if ($people["wife"]->getXref()==$pid) { - print "Head"; // label = Head + print "Head"; // label = Head }else{ - print PrintReady($people["wife"]->getLabel()); // label = Relationship + print PrintReady($people["wife"]->getLabel()); // label = Relationship } ?>", "<?php - print PrintReady($people["wife"]->getSex()); // gend = Gender + print PrintReady($people["wife"]->getSex()); // gend = Gender ?>", "<?php if ($married>=0 && isset($nam[1])){ - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) }else{ - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } ?>", "<?php - print PrintReady($people["wife"]->getbirthyear()); // yob = Year of Birth + print PrintReady($people["wife"]->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$people["wife"]->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($people["wife"]->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($people["wife"]->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'> <?php //if ($married>=0 && isset($nam[1])){ - // print PrintReady($fulmn); // Full Married Name + // print PrintReady($fulmn); // Full Married Name //} else { - print PrintReady($people["wife"]->getFullName()); // Full Name + print PrintReady($people["wife"]->getFullName()); // Full Name //} ?> </a> @@ -938,43 +938,43 @@ if (!defined('WT_WEBTREES')) { if ( ($child->canDisplayDetails()) ) { ?> <a href='javaScript:opener.insertRowToTable("<?php - print $child->getXref() ; // pid = PID + print $child->getXref() ; // pid = PID ?>", "<?php - // if ($married>0 && isset($nam[1])){ - // echo PrintReady($fulmn); // nam = Full Married Name - // }else{ - // print PrintReady($child->getFullName()); // nam = Full Name - echo PrintReady($fulln); // nam = Full Name - // } + // if ($married>0 && isset($nam[1])){ + // echo PrintReady($fulmn); // nam = Full Married Name + // }else{ + // print PrintReady($child->getFullName()); // nam = Full Name + echo PrintReady($fulln); // nam = Full Name + // } ?>", "<?php - print PrintReady($child->getLabel()); // label = Relationship + print PrintReady($child->getLabel()); // label = Relationship ?>", "<?php - print PrintReady($child->getSex()); // gend = Gender + print PrintReady($child->getSex()); // gend = Gender ?>", "<?php if ($married>0) { - echo "M"; // cond = Condition (Married) + echo "M"; // cond = Condition (Married) } else if ($married<0 || ($married=="0") ) { - echo "S"; // cond = Condition (Single) + echo "S"; // cond = Condition (Single) } else { - echo ""; // cond = Condition (Not Known) + echo ""; // cond = Condition (Not Known) } ?>", "<?php - print PrintReady($child->getbirthyear()); // yob = Year of Birth + print PrintReady($child->getbirthyear()); // yob = Year of Birth ?>", "<?php - print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB + print PrintReady($censyear-$child->getbirthyear()); // age = Census Date minus YOB ?>", "<?php - print "Y"; // YMD + print "Y"; // YMD ?>", "<?php - print ""; // occu = Occupation + print ""; // occu = Occupation ?>", "<?php - print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth + print PrintReady($child->getcensbirthplace()); // birthpl = Census Place of Birth ?>");'> <?php - // if ($married>=0 && isset($nam[1])){ - // print PrintReady($fulmn); // Full Married Name - // } else { - print PrintReady($child->getFullName()); // Full Name - // } + // if ($married>=0 && isset($nam[1])){ + // print PrintReady($fulmn); // Full Married Name + // } else { + print PrintReady($child->getFullName()); // Full Name + // } ?> </a> <?php print "\n" ; @@ -1002,9 +1002,9 @@ require_once WT_ROOT.'includes/functions/functions_charts.php'; * print the information for an individual chart box * * find and print a given individuals information for a pedigree chart - * @param string $pid the Gedcom Xref ID of the to print - * @param int $style the style to print the box in, 1 for smaller boxes, 2 for larger boxes - * @param int $count on some charts it is important to keep a count of how many boxes were printed + * @param string $pid the Gedcom Xref ID of the to print + * @param int $style the style to print the box in, 1 for smaller boxes, 2 for larger boxes + * @param int $count on some charts it is important to keep a count of how many boxes were printed */ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $currpid, $censyear) { global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $ZOOM_BOXES, $LINK_ICONS, $GEDCOM; @@ -1027,9 +1027,9 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $person=Person::getInstance($pid); if ($pid==false || empty($person)) { - $spouselinks = false; - $parentlinks = false; - $step_parentlinks = false; + $spouselinks = false; + $parentlinks = false; + $step_parentlinks = false; } $tmp=array('M'=>'','F'=>'F', 'U'=>'NN'); @@ -1100,24 +1100,24 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surn']; } $parentlinks .= "<a href=\"javascript:opener.insertRowToTable("; - $parentlinks .= "'".PrintReady($husb->getXref())."', "; // pid = PID - $parentlinks .= "'".PrintReady($fulln)."', "; // nam = Name + $parentlinks .= "'".PrintReady($husb->getXref())."', "; // pid = PID + $parentlinks .= "'".PrintReady($fulln)."', "; // nam = Name if ($currpid=="Wife" || $currpid=="Husband") { - $parentlinks .= "'Father in Law', "; // label = 1st Gen Male Relationship + $parentlinks .= "'Father in Law', "; // label = 1st Gen Male Relationship }else{ - $parentlinks .= "'Grand-Father', "; // label = 2st Gen Male Relationship + $parentlinks .= "'Grand-Father', "; // label = 2st Gen Male Relationship } - $parentlinks .= "'".PrintReady($husb->getSex())."', "; // sex = Gender - $parentlinks .= "''".", "; // cond = Condition (Married etc) - $parentlinks .= "'".PrintReady($husb->getbirthyear())."', "; // yob = Year of Birth + $parentlinks .= "'".PrintReady($husb->getSex())."', "; // sex = Gender + $parentlinks .= "''".", "; // cond = Condition (Married etc) + $parentlinks .= "'".PrintReady($husb->getbirthyear())."', "; // yob = Year of Birth if ($husb->getbirthyear()>=1) { - $parentlinks .= "'".PrintReady($censyear-$husb->getbirthyear())."', "; // age = Census Year - Year of Birth + $parentlinks .= "'".PrintReady($censyear-$husb->getbirthyear())."', "; // age = Census Year - Year of Birth }else{ - $parentlinks .= "''".", "; // age = Undefined + $parentlinks .= "''".", "; // age = Undefined } - $parentlinks .= "'Y'".", "; // Y/M/D = Age in Years/Months/Days - $parentlinks .= "''".", "; // occu = Occupation - $parentlinks .= "'".PrintReady($husb->getcensbirthplace())."'"; // birthpl = Birthplace + $parentlinks .= "'Y'".", "; // Y/M/D = Age in Years/Months/Days + $parentlinks .= "''".", "; // occu = Occupation + $parentlinks .= "'".PrintReady($husb->getcensbirthplace())."'"; // birthpl = Birthplace $parentlinks .= ");\">"; $parentlinks .= PrintReady($husb->getFullName()); $parentlinks .= "</a>"; @@ -1157,37 +1157,37 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surname']; } $parentlinks .= "<a href=\"javascript:opener.insertRowToTable("; - $parentlinks .= "'".PrintReady($wife->getXref())."',"; // pid = PID - // $parentlinks .= "'".PrintReady($fulln)."',"; // nam = Name + $parentlinks .= "'".PrintReady($wife->getXref())."',"; // pid = PID + // $parentlinks .= "'".PrintReady($fulln)."',"; // nam = Name //if ($married>=0 && isset($nam[1])){ - // $parentlinks .= "'".PrintReady($fulmn)."',"; // nam = Full Married Name + // $parentlinks .= "'".PrintReady($fulmn)."',"; // nam = Full Married Name //} else { - $parentlinks .= "'".PrintReady($fulln)."',"; // nam = Full Name + $parentlinks .= "'".PrintReady($fulln)."',"; // nam = Full Name //} if ($currpid=="Wife" || $currpid=="Husband") { - $parentlinks .= "'Mother in Law',"; // label = 1st Gen Female Relationship + $parentlinks .= "'Mother in Law',"; // label = 1st Gen Female Relationship }else{ - $parentlinks .= "'Grand-Mother',"; // label = 2st Gen Female Relationship + $parentlinks .= "'Grand-Mother',"; // label = 2st Gen Female Relationship } - $parentlinks .= "'".PrintReady($wife->getSex())."',"; // sex = Gender - $parentlinks .= "''".","; // cond = Condition (Married etc) - $parentlinks .= "'".PrintReady($wife->getbirthyear())."',"; // yob = Year of Birth + $parentlinks .= "'".PrintReady($wife->getSex())."',"; // sex = Gender + $parentlinks .= "''".","; // cond = Condition (Married etc) + $parentlinks .= "'".PrintReady($wife->getbirthyear())."',"; // yob = Year of Birth if ($wife->getbirthyear()>=1) { - $parentlinks .= "'".PrintReady($censyear-$wife->getbirthyear())."',"; // age = Census Year - Year of Birth + $parentlinks .= "'".PrintReady($censyear-$wife->getbirthyear())."',"; // age = Census Year - Year of Birth }else{ - $parentlinks .= "''".","; // age = Undefined + $parentlinks .= "''".","; // age = Undefined } - $parentlinks .= "'Y'".","; // Y/M/D = Age in Years/Months/Days - $parentlinks .= "''".","; // occu = Occupation - $parentlinks .= "'".PrintReady($wife->getcensbirthplace())."'"; // birthpl = Birthplace - //$parentlinks .= ");\"><div id='wifePar'>"; - $parentlinks .= ");\">"; + $parentlinks .= "'Y'".","; // Y/M/D = Age in Years/Months/Days + $parentlinks .= "''".","; // occu = Occupation + $parentlinks .= "'".PrintReady($wife->getcensbirthplace())."'"; // birthpl = Birthplace + //$parentlinks .= ");\"><div id='wifePar'>"; + $parentlinks .= ");\">"; //if ($married>=0 && isset($nam[1])){ - // $parentlinks .= $fulmn; // Full Married Name + // $parentlinks .= $fulmn; // Full Married Name //} else { - $parentlinks .= PrintReady($wife->getFullName()); // Full Name + $parentlinks .= PrintReady($wife->getFullName()); // Full Name //} // $parentlinks .= "</div></a>"; $parentlinks .= "</a>"; @@ -1325,43 +1325,43 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surname']; } $spouselinks .= "<a href=\"javascript:opener.insertRowToTable("; - $spouselinks .= "'".PrintReady($spouse->getXref())."',"; // pid = PID - //$spouselinks .= "'".PrintReady($fulln)."',"; // nam = Name + $spouselinks .= "'".PrintReady($spouse->getXref())."',"; // pid = PID + //$spouselinks .= "'".PrintReady($fulln)."',"; // nam = Name //if ($married>=0 && isset($nam[1])){ - // $spouselinks .= "'".PrintReady($fulmn)."',"; // Full Married Name + // $spouselinks .= "'".PrintReady($fulmn)."',"; // Full Married Name //} else { - $spouselinks .= "'".PrintReady($spouse->getFullName())."',"; // Full Name + $spouselinks .= "'".PrintReady($spouse->getFullName())."',"; // Full Name //} if ($currpid=="Son" || $currpid=="Daughter") { if ($spouse->getSex()=="M") { - $spouselinks .= "'Son in Law',"; // label = Male Relationship + $spouselinks .= "'Son in Law',"; // label = Male Relationship }else{ - $spouselinks .= "'Daughter in Law',"; // label = Female Relationship + $spouselinks .= "'Daughter in Law',"; // label = Female Relationship } }else{ if ($spouse->getSex()=="M") { - $spouselinks .= "'Brother in Law',"; // label = Male Relationship + $spouselinks .= "'Brother in Law',"; // label = Male Relationship }else{ - $spouselinks .= "'Sister in Law',"; // label = Female Relationship + $spouselinks .= "'Sister in Law',"; // label = Female Relationship } } - $spouselinks .= "'".PrintReady($spouse->getSex())."',"; // sex = Gender - $spouselinks .= "''".","; // cond = Condition (Married etc) - $spouselinks .= "'".PrintReady($spouse->getbirthyear())."',"; // yob = Year of Birth + $spouselinks .= "'".PrintReady($spouse->getSex())."',"; // sex = Gender + $spouselinks .= "''".","; // cond = Condition (Married etc) + $spouselinks .= "'".PrintReady($spouse->getbirthyear())."',"; // yob = Year of Birth if ($spouse->getbirthyear()>=1) { - $spouselinks .= "'".PrintReady($censyear-$spouse->getbirthyear())."',"; // age = Census Year - Year of Birth + $spouselinks .= "'".PrintReady($censyear-$spouse->getbirthyear())."',"; // age = Census Year - Year of Birth }else{ - $spouselinks .= "''".","; // age = Undefined + $spouselinks .= "''".","; // age = Undefined } - $spouselinks .= "'Y'".","; // Y/M/D = Age in Years/Months/Days - $spouselinks .= "''".","; // occu = Occupation - $spouselinks .= "'".PrintReady($spouse->getcensbirthplace())."'"; // birthpl = Birthplace - $spouselinks .= ");\">"; + $spouselinks .= "'Y'".","; // Y/M/D = Age in Years/Months/Days + $spouselinks .= "''".","; // occu = Occupation + $spouselinks .= "'".PrintReady($spouse->getcensbirthplace())."'"; // birthpl = Birthplace + $spouselinks .= ");\">"; // $spouselinks .= PrintReady($fulln); //if ($married>=0 && isset($nam[1])){ - // $spouselinks .= "'".PrintReady($fulmn)."',"; // Full Married Name + // $spouselinks .= "'".PrintReady($fulmn)."',"; // Full Married Name //} else { - $spouselinks .= PrintReady($spouse->getFullName()); // Full Name + $spouselinks .= PrintReady($spouse->getFullName()); // Full Name //} $spouselinks .= "</a>"; }else{ @@ -1393,35 +1393,35 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", } $spouselinks .= "<li>"; $spouselinks .= "<a href=\"javascript:opener.insertRowToTable("; - $spouselinks .= "'".PrintReady($child->getXref())."',"; // pid = PID - //$spouselinks .= "'".PrintReady($child->getFullName())."',"; // nam = Name - $spouselinks .= "'".PrintReady($fulln)."',"; // nam = Name + $spouselinks .= "'".PrintReady($child->getXref())."',"; // pid = PID + //$spouselinks .= "'".PrintReady($child->getFullName())."',"; // nam = Name + $spouselinks .= "'".PrintReady($fulln)."',"; // nam = Name if ($currpid=="Son" || $currpid=="Daughter") { if ($child->getSex()=="M") { - $spouselinks .= "'Grand-Son',"; // label = Male Relationship + $spouselinks .= "'Grand-Son',"; // label = Male Relationship }else{ - $spouselinks .= "'Grand-Daughter',"; // label = Female Relationship + $spouselinks .= "'Grand-Daughter',"; // label = Female Relationship } }else{ if ($child->getSex()=="M") { - $spouselinks .= "'Nephew',"; // label = Male Relationship + $spouselinks .= "'Nephew',"; // label = Male Relationship }else{ - $spouselinks .= "'Niece',"; // label = Female Relationship + $spouselinks .= "'Niece',"; // label = Female Relationship } } - $spouselinks .= "'".PrintReady($child->getSex())."',"; // sex = Gender - $spouselinks .= "''".","; // cond = Condition (Married etc) - $spouselinks .= "'".PrintReady($child->getbirthyear())."',"; // yob = Year of Birth + $spouselinks .= "'".PrintReady($child->getSex())."',"; // sex = Gender + $spouselinks .= "''".","; // cond = Condition (Married etc) + $spouselinks .= "'".PrintReady($child->getbirthyear())."',"; // yob = Year of Birth if ($child->getbirthyear()>=1) { - $spouselinks .= "'".PrintReady($censyear-$child->getbirthyear())."',"; // age = Census Year - Year of Birth + $spouselinks .= "'".PrintReady($censyear-$child->getbirthyear())."',"; // age = Census Year - Year of Birth }else{ - $spouselinks .= "''".","; // age = Undefined + $spouselinks .= "''".","; // age = Undefined } - $spouselinks .= "'Y'".","; // Y/M/D = Age in Years/Months/Days - $spouselinks .= "''".","; // occu = Occupation - $spouselinks .= "'".PrintReady($child->getcensbirthplace())."'"; // birthpl = Birthplace - $spouselinks .= ");\">"; - $spouselinks .= PrintReady($child->getFullName()); // Full Name + $spouselinks .= "'Y'".","; // Y/M/D = Age in Years/Months/Days + $spouselinks .= "''".","; // occu = Occupation + $spouselinks .= "'".PrintReady($child->getcensbirthplace())."'"; // birthpl = Birthplace + $spouselinks .= ");\">"; + $spouselinks .= PrintReady($child->getFullName()); // Full Name $spouselinks .= "</a>"; }else{ $spouselinks .= i18n::translate('Private'); diff --git a/modules/GEDFact_assistant/_MEDIA/media_5_input.php b/modules/GEDFact_assistant/_MEDIA/media_5_input.php index 423b40aa7e..82bce17ab8 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_5_input.php +++ b/modules/GEDFact_assistant/_MEDIA/media_5_input.php @@ -60,10 +60,10 @@ // Various JavaScript variables required --------------------------------- ?> <script language="javascript" type="text/javascript"> - var ifamily = "<?php echo i18n::translate('Open Family Navigator'); ?>"; - var remove = "<?php echo i18n::translate('Remove'); ?>"; - var linkExists = "<?php echo i18n::translate('This link already exists'); ?>"; - var imageDir = "<?php echo WT_THEME_DIR.'images/'; ?>"; + var ifamily = "<?php echo i18n::translate('Open Family Navigator'); ?>"; + var remove = "<?php echo i18n::translate('Remove'); ?>"; + var linkExists = "<?php echo i18n::translate('This link already exists'); ?>"; + var imageDir = "<?php echo WT_THEME_DIR.'images/'; ?>"; </script> <?php @@ -83,5 +83,3 @@ echo '<script src="modules/GEDFact_assistant/_MEDIA/media_5_input.js" type="text <tbody></tbody> <tr><td></td></tr> </table> - - diff --git a/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php b/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php index fa53c7fa14..6fdd46f652 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php +++ b/modules/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php @@ -39,11 +39,11 @@ function parseAddLinks() { var strRow = ''; for(var j=1; j<tr.cells.length; j++){ // Start at col 1 (j=1) if (j>=2) { - // dont show col 0 index - // SHOW col 1 id - // miss out col 2 name - // miss out col 3 relationship - // miss out col 4 delete button + // dont show col 0 index + // SHOW col 1 id + // miss out col 2 name + // miss out col 3 relationship + // miss out col 4 delete button continue; }else{ if (IE) { @@ -66,10 +66,10 @@ function parseRemLinks() { var remstrRow = ''; for(var j=1; j<remtr.cells.length; j++){ // Start at col 1 (j=1) if (j!=4 ) { - // dont show col 0 index - // miss out col 2 name - // miss out col 3 keep radio button - // choose col 4 remove radio button + // dont show col 0 index + // miss out col 2 name + // miss out col 3 keep radio button + // choose col 4 remove radio button continue; }else{ if (remtr.cells[j].childNodes[0].checked) { @@ -90,19 +90,19 @@ function preview() { function shiftlinks() { parseRemLinks(); - // alert('remstring = '+ remstr); + // alert('remstring = '+ remstr); if (remstr) { document.link.exist_links.value = remstr; } parseAddLinks(); - // alert('string = '+ str); + // alert('string = '+ str); if (str) { document.link.more_links.value = str; }else{ // leave hidden input morelinks as "No Values" var inputField = document.getElementById('gid'); - // alert(inputField.value) + // alert(inputField.value) if (inputField) { document.link.more_links.value = inputField.value+','; } @@ -112,5 +112,4 @@ function shiftlinks() { } } - -</script>
\ No newline at end of file +</script> diff --git a/modules/GEDFact_assistant/_MEDIA/media_query_1a.php b/modules/GEDFact_assistant/_MEDIA/media_query_1a.php index c449d3790a..192371629e 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_query_1a.php +++ b/modules/GEDFact_assistant/_MEDIA/media_query_1a.php @@ -82,8 +82,8 @@ if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) { $nam = $idrecord->getFullName(); echo $nam; echo "</td>"; - echo "<td align='center'><input alt='", i18n::translate('Keep Link in list'), "', title='", i18n::translate('Keep Link in list'), "' type='radio' id='", $link, "_off' name='", $link, "' checked /></td>"; - echo "<td align='center'><input alt='", i18n::translate('Remove Link from list'), "', title='", i18n::translate('Remove Link from list'), "' type='radio' id='", $link, "_on' name='", $link, "' /></td>"; + echo "<td align='center'><input alt='", i18n::translate('Keep Link in list'), "', title='", i18n::translate('Keep Link in list'), "' type='radio' id='", $link, "_off' name='", $link, "' checked /></td>"; + echo "<td align='center'><input alt='", i18n::translate('Remove Link from list'), "', title='", i18n::translate('Remove Link from list'), "' type='radio' id='", $link, "_on' name='", $link, "' /></td>"; if ($record->getType()=='INDI') { ?> @@ -107,6 +107,3 @@ if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) { </body> </html> - - - diff --git a/modules/GEDFact_assistant/_MEDIA/media_query_3a.php b/modules/GEDFact_assistant/_MEDIA/media_query_3a.php index e43efea5db..d11449e1ae 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_query_3a.php +++ b/modules/GEDFact_assistant/_MEDIA/media_query_3a.php @@ -32,7 +32,7 @@ define('WT_SCRIPT_NAME', 'modules/GEDFact_assistant/_MEDIA/media_query_3a.php'); require '../../../includes/session.php'; -$iid2 = safe_GET('iid'); +$iid2 = safe_GET('iid'); print_simple_header(i18n::translate('Link media')); diff --git a/modules/all_tab/module.php b/modules/all_tab/module.php index 37309c4dde..5d81a6c43a 100644 --- a/modules/all_tab/module.php +++ b/modules/all_tab/module.php @@ -85,7 +85,7 @@ class all_tab_WT_Module extends WT_Module implements WT_Module_Tab { } $out.= ' jQuery("#tabs > div").each(function() {'. - ' if (this.name!="'.$this->getName().'") {'. + ' if (this.name!="'.$this->getName().'") {'. ' jQuery(this).removeClass("ui-tabs-hide");'. ' }'. ' });'. diff --git a/modules/batch_update/plugins/married_names.php b/modules/batch_update/plugins/married_names.php index bdd8b0379d..7e14c91f38 100644 --- a/modules/batch_update/plugins/married_names.php +++ b/modules/batch_update/plugins/married_names.php @@ -111,7 +111,6 @@ class married_names_bu_plugin extends base_plugin { ($this->surname=='replace' ? ' selected="selected"' : ''). '">'.i18n::translate('Wife\'s surname replaced by husband\'s surname').'</option><option value="add"'. ($this->surname=='add' ? ' selected="selected"' : ''). - '">'.i18n::translate('Wife\'s maiden surname becomes new given name').'</option></select></td></tr>' - ; + '">'.i18n::translate('Wife\'s maiden surname becomes new given name').'</option></select></td></tr>'; } } diff --git a/modules/ckeditor/ckeditor_php4.php b/modules/ckeditor/ckeditor_php4.php index a5dea26f52..ff279357dc 100644 --- a/modules/ckeditor/ckeditor_php4.php +++ b/modules/ckeditor/ckeditor_php4.php @@ -239,11 +239,11 @@ class CKEditor $classDetection = "";
$js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
if (!empty($className)) {
- $js .= " var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
- $js .= " if (!classRegex.test(textarea.className))\n";
- $js .= " return false;\n";
+ $js .= " var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
+ $js .= " if (!classRegex.test(textarea.className))\n";
+ $js .= " return false;\n";
}
- $js .= " CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
+ $js .= " CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
$js .= "} );";
}
diff --git a/modules/ckeditor/ckeditor_php5.php b/modules/ckeditor/ckeditor_php5.php index 0efd33a1e8..7844a43446 100644 --- a/modules/ckeditor/ckeditor_php5.php +++ b/modules/ckeditor/ckeditor_php5.php @@ -235,11 +235,11 @@ class CKEditor $classDetection = "";
$js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
if (!empty($className)) {
- $js .= " var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
- $js .= " if (!classRegex.test(textarea.className))\n";
- $js .= " return false;\n";
+ $js .= " var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
+ $js .= " if (!classRegex.test(textarea.className))\n";
+ $js .= " return false;\n";
}
- $js .= " CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
+ $js .= " CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
$js .= "} );";
}
diff --git a/modules/clippings/clippings_ctrl.php b/modules/clippings/clippings_ctrl.php index 2a000fae8a..9c12509256 100644 --- a/modules/clippings/clippings_ctrl.php +++ b/modules/clippings/clippings_ctrl.php @@ -116,7 +116,7 @@ class ClippingsController extends BaseController { $this->type = safe_GET('type');
$this->conv_path = stripLRMRLM($this->conv_path);
- $_SESSION['exportConvPath'] = $this->conv_path; // remember this for the next Download
+ $_SESSION['exportConvPath'] = $this->conv_path; // remember this for the next Download
$_SESSION['exportConvSlashes'] = $this->conv_slashes;
if ($this->action == 'add') {
@@ -254,7 +254,7 @@ class ClippingsController extends BaseController { $tempUserID = '#ExPoRt#';
if ($this->privatize_export!='none') {
// Create a temporary userid
- $export_user_id = createTempUser($tempUserID, $this->privatize_export, $GEDCOM); // Create a temporary userid
+ $export_user_id = createTempUser($tempUserID, $this->privatize_export, $GEDCOM); // Create a temporary userid
// Temporarily become this user
$_SESSION["org_user"]=$_SESSION["wt_user"];
@@ -265,7 +265,7 @@ class ClippingsController extends BaseController { $clipping = $cart[$i];
if ($clipping['gedcom'] == $GEDCOM) {
$record = find_gedcom_record($clipping['id'], WT_GED_ID);
- $savedRecord = $record; // Save this for the "does this file exist" check
+ $savedRecord = $record; // Save this for the "does this file exist" check
if ($clipping['type']=='obje') $record = convert_media_path($record, $this->conv_path, $this->conv_slashes);
$record = privatize_gedcom($record);
$record = remove_custom_tags($record, $remove);
diff --git a/modules/clippings/module.php b/modules/clippings/module.php index 5e32c085ec..a5b577b6fc 100644 --- a/modules/clippings/module.php +++ b/modules/clippings/module.php @@ -304,10 +304,10 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module $icon=''; if ($tag=='INDI') $icon = "indis"; if ($tag=='FAM' ) $icon = "sfamily"; - // if ($tag=='SOUR') $icon = "source"; - // if ($tag=='REPO') $icon = "repository"; - // if ($tag=='NOTE') $icon = "notes"; - // if ($tag=='OBJE') $icon = "media"; + //if ($tag=='SOUR') $icon = "source"; + //if ($tag=='REPO') $icon = "repository"; + //if ($tag=='NOTE') $icon = "notes"; + //if ($tag=='OBJE') $icon = "media"; if (!empty($icon)) { $out .= '<li>'; if (!empty($icon)) { @@ -324,7 +324,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module } $out .= '</a>'; } - $out .= '<a class="remove_cart" href="sidebar.php?sb_action=clippings&remove='.$i.'"> + $out .= '<a class="remove_cart" href="sidebar.php?sb_action=clippings&remove='.$i.'"> <img src="'. $WT_IMAGES["remove"].'" border="0" alt="'.i18n::translate('Remove').'" title="'.i18n::translate('Remove').'" /></a>'; $out .='</li>'; } diff --git a/modules/family_nav/module.php b/modules/family_nav/module.php index f8b32d2a0a..1e8da59a10 100644 --- a/modules/family_nav/module.php +++ b/modules/family_nav/module.php @@ -216,7 +216,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { if ($pid == $child->getXref() ){
}else{
$menu = new Menu(" " . $child->getLabel() . "\n");
- // $menu->addClass("", "", "submenu");
+ //$menu->addClass("", "", "submenu");
if ($TEXT_DIRECTION=="ltr") {
$menu->addClass("", "", "submenu flyout2");
}else{
@@ -273,7 +273,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { ?>
<tr>
<td style="padding-bottom: 4px;" align="center" colspan="2">
- <?php
+ <?php
echo "<a style=\"font:12px tahoma, arial, helvetica, sans-serif; padding:0px; width:100%;\"href=\"family.php?famid=".$famid."\" onclick=\"return familyNavLoad('family.php?famid=".$famid."');\">";
echo "<b>".$label."</b>";
echo "</a>";
@@ -584,13 +584,13 @@ function print_pedigree_person_nav($pid, $style=1, $count=0, $personcount="1") { if (empty($SEARCH_SPIDER)) {
if ($LINK_ICONS!="disabled") {
//-- draw a box for the family flyout
- $parentlinks .= "<span class=\"flyout4\"><b>".i18n::translate('Parents')."</b></span><br />";
- $step_parentlinks .= "<span class=\"flyout4\"><b>".i18n::translate('Parents')."</b></span><br />";
- $spouselinks .= "<span class=\"flyout4\"><b>".i18n::translate('Family')."</b></span><br />";
+ $parentlinks .= "<span class=\"flyout4\"><b>".i18n::translate('Parents')."</b></span><br />";
+ $step_parentlinks .= "<span class=\"flyout4\"><b>".i18n::translate('Parents')."</b></span><br />";
+ $spouselinks .= "<span class=\"flyout4\"><b>".i18n::translate('Family')."</b></span><br />";
- $persons = "";
- $person_parent = "";
- $person_step = "";
+ $persons = "";
+ $person_parent = "";
+ $person_step = "";
diff --git a/modules/gedcom_favorites/db_schema/db_schema_0_1.php b/modules/gedcom_favorites/db_schema/db_schema_0_1.php index b48a514f5e..f9e87aa636 100644 --- a/modules/gedcom_favorites/db_schema/db_schema_0_1.php +++ b/modules/gedcom_favorites/db_schema/db_schema_0_1.php @@ -45,12 +45,12 @@ define('WT_FV_DB_SCHEMA_0_1', ''); WT_DB::exec( "CREATE TABLE IF NOT EXISTS `##favorites` (". " fv_id INTEGER AUTO_INCREMENT NOT NULL,". - " fv_username VARCHAR(32) NOT NULL,". + " fv_username VARCHAR(32) NOT NULL,". " fv_gid VARCHAR(20) NULL,". " fv_type VARCHAR(15) NULL,". " fv_file VARCHAR(100) NULL,". " fv_url VARCHAR(255) NULL,". - " fv_title VARCHAR(255) NULL,". + " fv_title VARCHAR(255) NULL,". " fv_note TEXT NULL,". " PRIMARY KEY (fv_id),". " KEY ix1 (fv_username)". diff --git a/modules/gedcom_favorites/module.php b/modules/gedcom_favorites/module.php index 175bf80a4f..78b21df43b 100644 --- a/modules/gedcom_favorites/module.php +++ b/modules/gedcom_favorites/module.php @@ -35,7 +35,7 @@ require_once WT_ROOT.'includes/classes/class_module.php'; // Create tables, if not already present try { WT_DB::updateSchema('./modules/gedcom_favorites/db_schema/', 'FV_SCHEMA_VERSION', 1); -} catch (PDOException $ex) { +} catch (PDOException $ex) { // The schema update scripts should never fail. If they do, there is no clean recovery. die($ex); } @@ -165,8 +165,8 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block { } else $content = ''; if ($block) { - $style = 2; // 1 means "regular box", 2 means "wide box" - $tableWidth = ($BROWSERTYPE=="msie") ? "95%" : "99%"; // IE needs to have room for vertical scroll bar inside the box + $style = 2; // 1 means "regular box", 2 means "wide box" + $tableWidth = ($BROWSERTYPE=="msie") ? "95%" : "99%"; // IE needs to have room for vertical scroll bar inside the box $cellSpacing = "1px"; } else { $style = 2; @@ -320,7 +320,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block { /** * deleteFavorite * deletes a favorite in the database - * @param int $fv_id the id of the favorite to delete + * @param int $fv_id the id of the favorite to delete */ public static function deleteFavorite($fv_id) { return (bool) @@ -330,7 +330,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block { /** * stores a new favorite in the database - * @param array $favorite the favorite array of the favorite to add + * @param array $favorite the favorite array of the favorite to add */ public static function addFavorite($favorite) { // -- make sure a favorite is added @@ -363,7 +363,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block { /** * Get a user's favorites * Return an array of a users messages - * @param string $username the username to get the favorites for + * @param string $username the username to get the favorites for */ public static function getUserFavorites($username) { $rows= @@ -389,4 +389,3 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block { return $favorites; } } -?> diff --git a/modules/gedcom_news/module.php b/modules/gedcom_news/module.php index 7dad1d0521..9b4e2201de 100644 --- a/modules/gedcom_news/module.php +++ b/modules/gedcom_news/module.php @@ -35,7 +35,7 @@ require_once WT_ROOT.'includes/classes/class_module.php'; // Create tables, if not already present try { WT_DB::updateSchema('./modules/gedcom_news/db_schema/', 'NB_SCHEMA_VERSION', 1); -} catch (PDOException $ex) { +} catch (PDOException $ex) { // The schema update scripts should never fail. If they do, there is no clean recovery. die($ex); } @@ -94,7 +94,8 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block { $name = WT_USER_NAME; } $title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; - $title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>"; } + $title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>"; + } $title .= i18n::translate('News'); if(WT_USER_GEDCOM_ADMIN) { $title .= help_link('index_gedcom_news_adm'); @@ -121,7 +122,6 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block { break; } } - // print "<div class=\"person_box\" id=\"{$news['anchor']}\">\n"; $content .= "<div class=\"news_box\" id=\"{$news['anchor']}\">\n"; // Look for $GLOBALS substitutions in the News title diff --git a/modules/googlemap/googlemap.php b/modules/googlemap/googlemap.php index d8fff12840..de683c050d 100644 --- a/modules/googlemap/googlemap.php +++ b/modules/googlemap/googlemap.php @@ -376,8 +376,8 @@ function create_indiv_buttons() { Map_type.prototype.initialize = function(place_map) { - var list = document.createElement("ul"); - list.id = 'map_type'; + var list = document.createElement("ul"); + list.id = 'map_type'; var button1 = document.createElement('li'); var button2 = document.createElement('li'); @@ -657,12 +657,12 @@ function build_indiv_map($indifacts, $famids) { $markers[$j]["placed"] = "yes"; if (($markers[$j]["lati"] == NULL) || ($markers[$j]["lng"] == NULL) || (($markers[$j]["lati"] == "0") && ($markers[$j]["lng"] == "0"))) { echo "var Marker{$j}_flag = new GIcon();\n"; - echo " Marker{$j}_flag.image = \"modules/googlemap/images/marker_yellow.png\";\n"; - echo " Marker{$j}_flag.shadow = \"modules/googlemap/images/shadow50.png\";\n"; - echo " Marker{$j}_flag.iconSize = new GSize(20, 34);\n"; - echo " Marker{$j}_flag.shadowSize = new GSize(37, 34);\n"; - echo " Marker{$j}_flag.iconAnchor = new GPoint(10, 34);\n"; - echo " Marker{$j}_flag.infoWindowAnchor = new GPoint(5, 1);\n"; + echo " Marker{$j}_flag.image = \"modules/googlemap/images/marker_yellow.png\";\n"; + echo " Marker{$j}_flag.shadow = \"modules/googlemap/images/shadow50.png\";\n"; + echo " Marker{$j}_flag.iconSize = new GSize(20, 34);\n"; + echo " Marker{$j}_flag.shadowSize = new GSize(37, 34);\n"; + echo " Marker{$j}_flag.iconAnchor = new GPoint(10, 34);\n"; + echo " Marker{$j}_flag.infoWindowAnchor = new GPoint(5, 1);\n"; echo "var Marker{$j} = new GMarker(new GLatLng(0, 0), {icon:Marker{$j}_flag, title:\"", addslashes($tooltip), "\"});\n"; } else if (empty($markers[$j]["icon"])) { echo "var Marker{$j} = new GMarker(new GLatLng({$markers[$j]["lati"]}, {$markers[$j]["lng"]}), {icon:icon, title:\"", addslashes($tooltip), "\"});\n"; @@ -882,5 +882,3 @@ function build_indiv_map($indifacts, $famids) { return $i; } - -?> diff --git a/modules/googlemap/pedigree_map.php b/modules/googlemap/pedigree_map.php index 8a34c39070..bc91252731 100644 --- a/modules/googlemap/pedigree_map.php +++ b/modules/googlemap/pedigree_map.php @@ -182,7 +182,7 @@ echo PrintReady($controller->getPersonName())."</h2>"; </td> </tr> </table> - </form> + </form> </td></tr> </table> @@ -270,7 +270,7 @@ echo "</table>\n"; echo "<hr />"; echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">"; echo " <tr>"; -echo " <td valign=\"top\">"; +echo " <td valign=\"top\">"; // print summary statistics if (isset($curgen)){ $total=pow(2,$curgen)-1; @@ -284,7 +284,7 @@ if (isset($curgen)){ echo "</td>\n"; echo " </tr>\n"; echo " <tr>\n"; - echo " <td valign=\"top\">\n"; + echo " <td valign=\"top\">\n"; if ($priv) { echo i18n::plural('%s individual is private.', '%s individuals are private.', $priv, $priv), '<br/>'; } @@ -301,7 +301,7 @@ if (isset($curgen)){ } } } -echo " </td>\n"; +echo " </td>\n"; echo " </tr>\n"; echo "</table>\n"; echo "</div>"; @@ -466,8 +466,8 @@ function Map_type() {} Map_type.prototype.initialize = function(pm_map) { - var list = document.createElement("ul"); - list.id = 'map_type'; + var list = document.createElement("ul"); + list.id = 'map_type'; var button1 = document.createElement('li'); var button2 = document.createElement('li'); @@ -776,7 +776,7 @@ document.getElementById("side_bar").innerHTML = side_bar_html; <?php } if ($GOOGLEMAP_PH_WHEEL) echo "pm_map.enableScrollWheelZoom();\n"; - echo " pm_map.setMapType($GOOGLEMAP_MAP_TYPE);\n"; + echo " pm_map.setMapType($GOOGLEMAP_MAP_TYPE);\n"; ?> // End context menu creation } diff --git a/modules/googlemap/placecheck.php b/modules/googlemap/placecheck.php index 986b0f01b2..5bd4daa044 100644 --- a/modules/googlemap/placecheck.php +++ b/modules/googlemap/placecheck.php @@ -336,15 +336,14 @@ case 'go': // echo final row of table echo "<tr><td colspan=\"2\" class=\"list_label\">", i18n::translate('Total unique places'), ": ", $countrows, "</td></tr></table><br /><br />"; - break; + break; default: // Do not run until user selects a gedcom/place/etc. // Instead, show some useful help info. echo "<p>", i18n::translate('This will list all the places from the selected GEDCOM file. By default this will NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables'), "</p><hr />"; - break; + break; } //echo footers echo "<hr />"; print_footer(); -?> diff --git a/modules/googlemap/placehierarchy.php b/modules/googlemap/placehierarchy.php index 1db4b47bcf..95735aae17 100644 --- a/modules/googlemap/placehierarchy.php +++ b/modules/googlemap/placehierarchy.php @@ -238,12 +238,12 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place global $GOOGLEMAP_COORD, $GOOGLEMAP_PH_MARKER, $GM_DISP_SHORT_PLACE, $GM_DISP_COUNT; if (($place2['lati'] == NULL) || ($place2['long'] == NULL) || (($place2['lati'] == "0") && ($place2['long'] == "0"))) { echo "var icon_type = new GIcon();\n"; - echo " icon_type.image = \"modules/googlemap/images/marker_yellow.png\";\n"; - echo " icon_type.shadow = \"modules/googlemap/images/shadow50.png\";\n"; - echo " icon_type.iconSize = new GSize(20, 34);\n"; - echo " icon_type.shadowSize = new GSize(37, 34);\n"; - echo " icon_type.iconAnchor = new GPoint(6, 20);\n"; - echo " icon_type.infoWindowAnchor = new GPoint(5, 1);\n"; + echo " icon_type.image = \"modules/googlemap/images/marker_yellow.png\";\n"; + echo " icon_type.shadow = \"modules/googlemap/images/shadow50.png\";\n"; + echo " icon_type.iconSize = new GSize(20, 34);\n"; + echo " icon_type.shadowSize = new GSize(37, 34);\n"; + echo " icon_type.iconAnchor = new GPoint(6, 20);\n"; + echo " icon_type.infoWindowAnchor = new GPoint(5, 1);\n"; echo "var point = new GLatLng(0, 0);\n"; if ($lastlevel) echo "var marker = createMarker(point, \"<td width='100%'><div class='iwstyle' style='width: 250px;'><a href='?level=", $level, $linklevels, "'><br />"; @@ -318,12 +318,12 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place echo "var icon_type = new GIcon(G_DEFAULT_ICON);\n"; } else { echo "var icon_type = new GIcon();\n"; - echo " icon_type.image = \"", $place2['icon'], "\";\n"; - echo " icon_type.shadow = \"modules/googlemap/images/flag_shadow.png\";\n"; - echo " icon_type.iconSize = new GSize(25, 15);\n"; - echo " icon_type.shadowSize = new GSize(35, 45);\n"; - echo " icon_type.iconAnchor = new GPoint(1, 45);\n"; - echo " icon_type.infoWindowAnchor = new GPoint(5, 1);\n"; + echo " icon_type.image = \"", $place2['icon'], "\";\n"; + echo " icon_type.shadow = \"modules/googlemap/images/flag_shadow.png\";\n"; + echo " icon_type.iconSize = new GSize(25, 15);\n"; + echo " icon_type.shadowSize = new GSize(35, 45);\n"; + echo " icon_type.iconAnchor = new GPoint(1, 45);\n"; + echo " icon_type.infoWindowAnchor = new GPoint(5, 1);\n"; } echo "var point = new GLatLng({$lati}, {$long});\n"; if ($lastlevel) { @@ -384,8 +384,8 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place if (!$GOOGLEMAP_COORD){ echo "<br /><br /></div></td>\", icon_type, \"", $temp, "\");\n"; } else { - echo "<br /><br />", $place2['lati'], ", ", $place2['long'], "</div></td>\", icon_type, \"", $temp, "\");\n"; - } + echo "<br /><br />", $place2['lati'], ", ", $place2['long'], "</div></td>\", icon_type, \"", $temp, "\");\n"; + } } echo "place_map.addOverlay(marker);\n"; echo "bounds.extend(point);\n"; @@ -399,7 +399,7 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla // <![CDATA[ if (window.attachEvent) { window.attachEvent("onunload", function() { - GUnload(); // Internet Explorer + GUnload(); // Internet Explorer }); } else { window.addEventListener("unload", function() { @@ -446,8 +446,8 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla Map_type.prototype.initialize = function(place_map) { - var list = document.createElement("ul"); - list.id = 'map_type'; + var list = document.createElement("ul"); + list.id = 'map_type'; var button1 = document.createElement('li'); var button2 = document.createElement('li'); @@ -523,24 +523,24 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla $levelo=check_were_am_i($numls, $levelm); if ($numfound<2 && ($level==1 || !(isset($levelo[($level-1)])))){ echo "zoomlevel = place_map.getBoundsZoomLevel(bounds);\n"; - echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+5);\n"; + echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+5);\n"; } else if ($numfound<2 && !isset($levelo[($level-2)])){ echo "zoomlevel = place_map.getBoundsZoomLevel(bounds);\n"; - echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+6);\n"; + echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+6);\n"; } else if ($level==2){ echo "zoomlevel = place_map.getBoundsZoomLevel(bounds);\n"; - echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+8);\n"; + echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+8);\n"; } else if ($numfound<2 && $level>1){ echo "zoomlevel = place_map.getBoundsZoomLevel(bounds);\n"; - echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+10);\n"; + echo " place_map.setCenter(new GLatLng(0, 0), zoomlevel+10);\n"; } else echo "place_map.setCenter(new GLatLng(0, 0), 1);\n"; if ($GOOGLEMAP_PH_WHEEL) echo "place_map.enableScrollWheelZoom();\n"; - echo " place_map.setMapType($GOOGLEMAP_MAP_TYPE);\n"; + echo " place_map.setMapType($GOOGLEMAP_MAP_TYPE);\n"; ?> //create markers <?php @@ -653,4 +653,3 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla </script> <?php } -?> diff --git a/modules/googlemap/places.php b/modules/googlemap/places.php index 0abae27946..31a668946b 100644 --- a/modules/googlemap/places.php +++ b/modules/googlemap/places.php @@ -41,9 +41,9 @@ require WT_ROOT.'modules/googlemap/defaultconfig.php'; global $iso3166; $action=safe_REQUEST($_REQUEST, 'action'); -if (isset($_REQUEST['parent'])) $parent=$_REQUEST['parent']; +if (isset($_REQUEST['parent'])) $parent=$_REQUEST['parent']; if (isset($_REQUEST['display'])) $display=$_REQUEST['display']; -if (isset($_REQUEST['mode'])) $mode=$_REQUEST['mode']; +if (isset($_REQUEST['mode'])) $mode=$_REQUEST['mode']; if (isset($_REQUEST['deleteRecord'])) $deleteRecord=$_REQUEST['deleteRecord']; if (!isset($parent)) $parent=0; @@ -658,4 +658,3 @@ else { echo i18n::translate('Search Engine Spider Detected'), ": ", $SEARCH_SPIDER; echo "\n</div>\n\t</body>\n</html>"; } -?> diff --git a/modules/googlemap/places_edit.php b/modules/googlemap/places_edit.php index 2f11143d87..360c5a4f5b 100644 --- a/modules/googlemap/places_edit.php +++ b/modules/googlemap/places_edit.php @@ -142,9 +142,9 @@ if ($action=="update") { $selected_country = $selected_country[1]; else $selected_country = "Countries"; - $parent_id = $row->pl_parent_id; - $level = $row->pl_level; - $zoomfactor = $row->pl_zoom; + $parent_id = $row->pl_parent_id; + $level = $row->pl_level; + $zoomfactor = $row->pl_zoom; $parent_lati = "0.0"; $parent_long = "0.0"; if ($row->pl_lati!==null && $row->pl_long!==null) { @@ -217,7 +217,7 @@ if ($action=="add") { $parent_long = "0.0"; $place_icon = ""; $parent_id = 0; - $level = 0; + $level = 0; $zoomfactor = $GOOGLEMAP_MIN_ZOOM; } $selected_country = "Countries"; @@ -237,10 +237,10 @@ if ($action=="add") { <!-- if (window.attachEvent) { window.attachEvent("onload", function() { - loadMap(); // Internet Explorer + loadMap(); // Internet Explorer }); window.attachEvent("onunload", function() { - GUnload(); // Internet Explorer + GUnload(); // Internet Explorer }); } else { window.addEventListener("load", function() { @@ -356,8 +356,8 @@ if ($action=="add") { Map_type.prototype.initialize = function(place_map) { - var list = document.createElement("ul"); - list.id = 'map_type'; + var list = document.createElement("ul"); + list.id = 'map_type'; var button1 = document.createElement('li'); var button2 = document.createElement('li'); @@ -514,13 +514,13 @@ if ($action=="add") { $row->pl_long = "-".abs($pl_long); } - echo " childplaces.push(new GMarker(new GLatLng(", $row->pl_lati, ", ", $row->pl_long, "), childicon));\n"; - echo " GEvent.addListener(childplaces[", $i, "], \"click\", function() {\n"; + echo " childplaces.push(new GMarker(new GLatLng(", $row->pl_lati, ", ", $row->pl_long, "), childicon));\n"; + echo " GEvent.addListener(childplaces[", $i, "], \"click\", function() {\n"; echo " childplaces[", $i, "].openInfoWindowHtml(\"<td width='100%'><div class='iwstyle' style='width: 250px;'><br />", addslashes($row->pl_place), "<br /><br /></div>\")});\n"; - echo " map.addOverlay(childplaces[", $i, "]);\n"; - echo " bounds.extend(new GLatLng(", $row->pl_lati, ", ", $row->pl_long, "));\n"; + echo " map.addOverlay(childplaces[", $i, "]);\n"; + echo " bounds.extend(new GLatLng(", $row->pl_lati, ", ", $row->pl_long, "));\n"; $i++; - echo " map.setCenter(bounds.getCenter());\n"; + echo " map.setCenter(bounds.getCenter());\n"; } } } @@ -535,9 +535,9 @@ if ($action=="add") { icon_type.iconAnchor = new GPoint(10, 34); icon_type.infoWindowAnchor = new GPoint(5, 1); map.addOverlay(new GMarker(new GLatLng(<?php echo $parent_lati, ", ", $parent_long;?>), icon_type)); -<?php } else { ?> +<?php } else { ?> map.addOverlay(new GMarker(new GLatLng(<?php echo $place_lati, ", ", $place_long;?>))); -<?php } +<?php } } else { ?> var flagicon = new GIcon(); @@ -547,11 +547,11 @@ if ($action=="add") { flagicon.shadowSize = new GSize(35, 45); flagicon.iconAnchor = new GPoint(1, 45); flagicon.infoWindowAnchor = new GPoint(5, 1); -<?php if (($place_lati == null) || ($place_long == null)) {?> +<?php if (($place_lati == null) || ($place_long == null)) {?> map.addOverlay(new GMarker(new GLatLng(<?php echo $parent_lati, ", ", $parent_long;?>), flagicon)); -<?php } else { ?> +<?php } else { ?> map.addOverlay(new GMarker(new GLatLng(<?php echo $place_lati, ", ", $place_long;?>), flagicon)); -<?php } +<?php } } } ?> // Our info window content @@ -621,7 +621,7 @@ if ($action=="add") { map.clearOverlays(); var bounds = new GLatLngBounds(); if (!response || response.Status.code != 200) { - alert("<?php echo i18n::translate('No places found');?>"); + alert("<?php echo i18n::translate('No places found');?>"); } else { if(response.Placemark.length>0) { for (i=0;i<response.Placemark.length;i++) { @@ -694,7 +694,7 @@ if ($action=="add") { <div id="INDI_PLAC_pop" style="display: inline;"> <?php print_specialchar_link("NEW_PLACE_NAME", false);?></div> <label for="new_pl_name"><a href="javascript:;" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false"> <?php echo i18n::translate('Search on this level')?></a></label> | - <label for="new_pl_name"><a href="javascript:;" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false"> <?php echo i18n::translate('Search all')?></a></label> + <label for="new_pl_name"><a href="javascript:;" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false"> <?php echo i18n::translate('Search all')?></a></label> </td> </tr> <tr> @@ -780,4 +780,3 @@ if ($action=="add") { echo "<center><br /><br /><br /><a href=\"javascript:;\" onclick=\"edit_close('{$link}')\">", i18n::translate('Close Window'), "</a><br /></center>\n"; print_simple_footer(); -?> diff --git a/modules/html/module.php b/modules/html/module.php index 5368159cef..6f4186839d 100644 --- a/modules/html/module.php +++ b/modules/html/module.php @@ -55,8 +55,8 @@ class html_WT_Module extends WT_Module implements WT_Module_Block { } /* - * Select GEDCOM - */ + * Select GEDCOM + */ $gedcom=get_block_setting($block_id, 'gedcom'); switch($gedcom) { case '__current__': @@ -80,8 +80,8 @@ class html_WT_Module extends WT_Module implements WT_Module_Block { } /* - * Initiate the stats object. - */ + * Initiate the stats object. + */ if(get_block_setting($block_id, 'ui')) { $stats = new stats_ui($GEDCOM); } else { @@ -89,17 +89,17 @@ class html_WT_Module extends WT_Module implements WT_Module_Block { } /* - * First Pass. - * Handle embedded language, fact, global, etc. references - * This needs to be done first because the language variables could themselves - * contain embedded keywords. - */ + * First Pass. + * Handle embedded language, fact, global, etc. references + * This needs to be done first because the language variables could themselves + * contain embedded keywords. + */ // Title $title_tmp=embed_globals(get_block_setting($block_id, 'title')); $html =embed_globals(get_block_setting($block_id, 'html')); /* - * Second Pass. - */ + * Second Pass. + */ list($new_tags, $new_values) = $stats->getTags("{$title_tmp} {$html}"); // Title if (strstr($title_tmp, '#')){$title_tmp = str_replace($new_tags, $new_values, $title_tmp);} @@ -107,12 +107,12 @@ class html_WT_Module extends WT_Module implements WT_Module_Block { $html = str_replace($new_tags, $new_values, $html); /* - * Restore Current GEDCOM - */ + * Restore Current GEDCOM + */ $GEDCOM = WT_GEDCOM; /* - * Start Of Output + * Start Of Output */ $id=$this->getName().$block_id; $title=''; diff --git a/modules/lightbox/album.php b/modules/lightbox/album.php index 4fd84cd33e..523af3d6c0 100644 --- a/modules/lightbox/album.php +++ b/modules/lightbox/album.php @@ -42,7 +42,7 @@ $reorder=safe_get('reorder', '1', '0'); // Get Javascript variables from lb_config.php --------------------------- require_once WT_ROOT.'modules/lightbox/lb_defaultconfig.php'; -// require_once WT_ROOT.'modules/lightbox/functions/browser_detection_php_ar.php'; +// require_once WT_ROOT.'modules/lightbox/functions/browser_detection_php_ar.php'; require_once WT_ROOT.'modules/lightbox/functions/lightbox_print_media.php'; require_once WT_ROOT.'modules/lightbox/functions/lightbox_print_media_row.php'; @@ -125,17 +125,17 @@ $sort_i=0; // Used in sorting on lightbox_print_media_row.php page //------------------------------------------------------------------------------ // Build Thumbnail Rows //------------------------------------------------------------------------------ -// echo "<td valign=\"top\">"; +// echo "<td valign=\"top\">"; echo "<table width=\"100%\" cellpadding=\"0\" border=\"0\"><tr>"; echo "<td width=\"100%\" valign=\"top\" >"; - lightbox_print_media($pid, 0, true, 1); // map, painting, photo, tombstone) - lightbox_print_media($pid, 0, true, 2); // card, certificate, document, magazine, manuscript, newspaper - lightbox_print_media($pid, 0, true, 3); // electronic, fiche, film - lightbox_print_media($pid, 0, true, 4); // audio, book, coat, video, other - lightbox_print_media($pid, 0, true, 5); // footnotes + lightbox_print_media($pid, 0, true, 1); // map, painting, photo, tombstone) + lightbox_print_media($pid, 0, true, 2); // card, certificate, document, magazine, manuscript, newspaper + lightbox_print_media($pid, 0, true, 3); // electronic, fiche, film + lightbox_print_media($pid, 0, true, 4); // audio, book, coat, video, other + lightbox_print_media($pid, 0, true, 5); // footnotes echo "</td>"; echo "</tr></table>"; -// echo "</td>"; +// echo "</td>"; //------------------------------------------------------------------------------ // End Thumbnail Rows //------------------------------------------------------------------------------ @@ -161,6 +161,3 @@ $sort_i=0; // Used in sorting on lightbox_print_media_row.php page // End Main Table //------------------------------------------------------------------------------ //echo "</tr></table>"; - - -?> diff --git a/modules/lightbox/functions/lb_call_js.php b/modules/lightbox/functions/lb_call_js.php index 2bad11221b..bdc717a852 100644 --- a/modules/lightbox/functions/lb_call_js.php +++ b/modules/lightbox/functions/lb_call_js.php @@ -37,68 +37,68 @@ if (!defined('WT_WEBTREES')) { global $tabno, $LB_MUSIC_FILE, $LB_SS_SPEED, $LB_TRANSITION, $TEXT_DIRECTION; // Get Javascript variables from lb_config.php --------------------------- -// require_once WT_ROOT.'modules/lightbox/lb_defaultconfig.php'; -// if ($theme_name=="Minimal") { - // Force icon options to "text" when we're dealing with the Minimal theme -// if ($LB_AL_HEAD_LINKS!="none") $LB_AL_HEAD_LINKS = "text"; -// if ($LB_AL_THUMB_LINKS!="none") $LB_AL_THUMB_LINKS = "text"; -// if ($LB_ML_THUMB_LINKS!="none") $LB_ML_THUMB_LINKS = "text"; -// } +// require_once WT_ROOT.'modules/lightbox/lb_defaultconfig.php'; +// if ($theme_name=="Minimal") { +// Force icon options to "text" when we're dealing with the Minimal theme +// if ($LB_AL_HEAD_LINKS!="none") $LB_AL_HEAD_LINKS = "text"; +// if ($LB_AL_THUMB_LINKS!="none") $LB_AL_THUMB_LINKS = "text"; +// if ($LB_ML_THUMB_LINKS!="none") $LB_ML_THUMB_LINKS = "text"; +// } ?> <script language="javascript" type="text/javascript"> - var CB_ImgDetails = "<?php print i18n::translate('Details'); ?>"; // = "Details" - var CB_Detail_Info = "<?php print i18n::translate('View this Media Item Details ... Plus other Media Options - MediaViewer page'); ?>"; // = "View this Media Item......etc" - var CB_ImgNotes = "<?php print i18n::translate('Notes'); ?>"; // = "Notes" - var CB_Note_Info = "<?php print ''; ?>"; // = "" - var CB_Pause_SS = "<?php print i18n::translate('Pause Slideshow'); ?>"; // = "Pause Slideshow" - var CB_Start_SS = "<?php print i18n::translate('Start Slideshow'); ?>"; // = "Start Slideshow" - var CB_Music = "<?php print i18n::translate('Turn Music On/Off'); ?>"; // = "Music On/Off " - var CB_Zoom_Off = "<?php print i18n::translate('Disable Zoom'); ?>"; // = "Disable Zoom" - var CB_Zoom_On = "<?php print i18n::translate('Zoom is enabled ... Use mousewheel or i and o keys to zoom in and out'); ?>"; // = "Zoom is Enabled" - var CB_Close_Win = "<?php print i18n::translate('Close Lightbox window'); ?>"; // = "Close Lightbox Window" - var CB_Balloon = "<?php print "false"; ?>"; // Notes Tooltip Balloon or not + var CB_ImgDetails = "<?php print i18n::translate('Details'); ?>"; // = "Details" + var CB_Detail_Info = "<?php print i18n::translate('View this Media Item Details ... Plus other Media Options - MediaViewer page'); ?>"; // = "View this Media Item......etc" + var CB_ImgNotes = "<?php print i18n::translate('Notes'); ?>"; // = "Notes" + var CB_Note_Info = "<?php print ''; ?>"; // = "" + var CB_Pause_SS = "<?php print i18n::translate('Pause Slideshow'); ?>"; // = "Pause Slideshow" + var CB_Start_SS = "<?php print i18n::translate('Start Slideshow'); ?>"; // = "Start Slideshow" + var CB_Music = "<?php print i18n::translate('Turn Music On/Off'); ?>"; // = "Music On/Off " + var CB_Zoom_Off = "<?php print i18n::translate('Disable Zoom'); ?>"; // = "Disable Zoom" + var CB_Zoom_On = "<?php print i18n::translate('Zoom is enabled ... Use mousewheel or i and o keys to zoom in and out'); ?>"; // = "Zoom is Enabled" + var CB_Close_Win = "<?php print i18n::translate('Close Lightbox window'); ?>"; // = "Close Lightbox Window" + var CB_Balloon = "<?php print "false"; ?>"; // Notes Tooltip Balloon or not <?php if ($TEXT_DIRECTION=="rtl") { ?> - var CB_Alignm = "<?php print "right"; ?>"; // Notes RTL Tooltip Balloon Text align - var CB_ImgNotes2 = "<?php print i18n::translate('Notes'); ?>"; // Notes RTL Tooltip for Full Image + var CB_Alignm = "<?php print "right"; ?>"; // Notes RTL Tooltip Balloon Text align + var CB_ImgNotes2 = "<?php print i18n::translate('Notes'); ?>"; // Notes RTL Tooltip for Full Image <?php }else{ ?> - var CB_Alignm = "<?php print "left"; ?>"; // Notes LTR Tooltip Balloon Text align - var CB_ImgNotes2 = "<?php print i18n::translate('Notes'); ?>"; // Notes LTR Tooltip for Full Image + var CB_Alignm = "<?php print "left"; ?>"; // Notes LTR Tooltip Balloon Text align + var CB_ImgNotes2 = "<?php print i18n::translate('Notes'); ?>"; // Notes LTR Tooltip for Full Image <?php }?> <?php if ($LB_MUSIC_FILE == "") { ?> var myMusic = null; <?php }else{ ?> - var myMusic = '<?php print $LB_MUSIC_FILE; ?>'; // The music file + var myMusic = '<?php print $LB_MUSIC_FILE; ?>'; // The music file <?php } ?> - var CB_SlShowTime = '<?php print $LB_SS_SPEED; ?>'; // Slide show timer - var CB_Animation = '<?php print $LB_TRANSITION; ?>'; // Next/Prev Image transition effect + var CB_SlShowTime = '<?php print $LB_SS_SPEED; ?>'; // Slide show timer + var CB_Animation = '<?php print $LB_TRANSITION; ?>'; // Next/Prev Image transition effect </script> <?php // ------------------------------------------------------------------------------- ?> <?php if ($TEXT_DIRECTION == "rtl") { ?> - <script src="modules/lightbox/js/Sound.js" type="text/javascript"></script> - <script src="modules/lightbox/js/clearbox.js" type="text/javascript"></script> + <script src="modules/lightbox/js/Sound.js" type="text/javascript"></script> + <script src="modules/lightbox/js/clearbox.js" type="text/javascript"></script> <!--[if lte IE 7]> - <link href ="modules/lightbox/css/album_page_RTL.css" rel="stylesheet" type="text/css" media="screen" /> + <link href ="modules/lightbox/css/album_page_RTL.css" rel="stylesheet" type="text/css" media="screen" /> <![endif]--> <?php }else{ ?> - <script src="modules/lightbox/js/Sound.js" type="text/javascript"></script> - <script src="modules/lightbox/js/clearbox.js" type="text/javascript"></script> + <script src="modules/lightbox/js/Sound.js" type="text/javascript"></script> + <script src="modules/lightbox/js/clearbox.js" type="text/javascript"></script> <?php } ?> - <script src="modules/lightbox/js/wz_tooltip.js" type="text/javascript"></script> - <script src="modules/lightbox/js/tip_centerwindow.js" type="text/javascript"></script> + <script src="modules/lightbox/js/wz_tooltip.js" type="text/javascript"></script> + <script src="modules/lightbox/js/tip_centerwindow.js" type="text/javascript"></script> <?php if ($TEXT_DIRECTION=="rtl") { ?> - <script src="modules/lightbox/js/tip_balloon_RTL.js" type="text/javascript"></script> + <script src="modules/lightbox/js/tip_balloon_RTL.js" type="text/javascript"></script> <?php }else{ ?> - <script src="modules/lightbox/js/tip_balloon.js" type="text/javascript"></script> + <script src="modules/lightbox/js/tip_balloon.js" type="text/javascript"></script> <?php } ?> <?php @@ -107,5 +107,3 @@ global $tabno, $LB_MUSIC_FILE, $LB_SS_SPEED, $LB_TRANSITION, $TEXT_DIRECTION; // ------------------------------------------------------------------------------- - -?> diff --git a/modules/lightbox/functions/lb_horiz_sort.php b/modules/lightbox/functions/lb_horiz_sort.php index b3fde0b940..45edecf0ab 100644 --- a/modules/lightbox/functions/lb_horiz_sort.php +++ b/modules/lightbox/functions/lb_horiz_sort.php @@ -85,19 +85,18 @@ if (!defined('WT_WEBTREES')) { //sections = [ 'group1','group2' ]; <?php if ($rownum1>0) { ?> - Sortable.create( 'thumblist_1', { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); + Sortable.create( 'thumblist_1', { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); <?php } ?> <?php if ($rownum2>0) { ?> - Sortable.create( 'thumblist_2', { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); + Sortable.create( 'thumblist_2', { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); <?php } ?> <?php if ($rownum3>0) { ?> - Sortable.create( "thumblist_3", { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); + Sortable.create( "thumblist_3", { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); <?php } ?> <?php if ($rownum4>0) { ?> - Sortable.create( "thumblist_4", { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); + Sortable.create( "thumblist_4", { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); <?php } ?> -// Sortable.create( "thumblist", { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); +// Sortable.create( "thumblist", { tag:'li', dropOnEmpty: false, constraint: false, only:'facts_value' } ); // ]]> </script> - diff --git a/modules/lightbox/functions/lb_indi_doors_0.php b/modules/lightbox/functions/lb_indi_doors_0.php index b118ca853b..84fc59882d 100644 --- a/modules/lightbox/functions/lb_indi_doors_0.php +++ b/modules/lightbox/functions/lb_indi_doors_0.php @@ -59,10 +59,5 @@ if (!defined('WT_WEBTREES')) { <?php if (file_exists("modules/googlemap/defaultconfig.php")) { ?> <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('Map')?></a></dd> <?php } ?> -<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php print "Spare Tab" ?></a></dd> --> +<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php print "Spare Tab" ?></a></dd> --> <dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('All')?></a></dd> - - - - - diff --git a/modules/lightbox/functions/lb_indi_doors_1.php b/modules/lightbox/functions/lb_indi_doors_1.php index 2000e653fa..108ab25cce 100644 --- a/modules/lightbox/functions/lb_indi_doors_1.php +++ b/modules/lightbox/functions/lb_indi_doors_1.php @@ -62,10 +62,6 @@ if (!defined('WT_WEBTREES')) { <?php if (file_exists("modules/googlemap/defaultconfig.php")) { ?> <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('Map')?></a></dd> <?php } ?> -<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php print "Spare Tab" ?></a></dd> --> +<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php print "Spare Tab" ?></a></dd> --> <dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php print i18n::translate('All')?></a></dd> - - - - diff --git a/modules/lightbox/functions/lb_link.php b/modules/lightbox/functions/lb_link.php index 9a928d7d99..bec1c79980 100644 --- a/modules/lightbox/functions/lb_link.php +++ b/modules/lightbox/functions/lb_link.php @@ -41,7 +41,7 @@ if (!defined('WT_WEBTREES')) { * * @param string $mediaid */ -// function print_link_menu2($mediaid) { +// function print_link_menu2($mediaid) { $mediaid=$media["XREF"]; global $TEXT_DIRECTION, $WT_IMAGES; if (!isset($WT_IMAGES['image_link'])) { @@ -91,9 +91,9 @@ if (!defined('WT_WEBTREES')) { </script> <?php -// } +// } // Only set link on media that is in the DB -// if ($media["XREF"] != "") { -// print_link_menu($media2["XREF"]); -// } +// if ($media["XREF"] != "") { +// print_link_menu($media2["XREF"]); +// } diff --git a/modules/lightbox/functions/lightbox_print_media_row.php b/modules/lightbox/functions/lightbox_print_media_row.php index a6f13f3152..2c34e7e078 100644 --- a/modules/lightbox/functions/lightbox_print_media_row.php +++ b/modules/lightbox/functions/lightbox_print_media_row.php @@ -158,41 +158,41 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { //text alignment for Tooltips if ($TEXT_DIRECTION=="rtl") { $alignm = "right"; - $left = "true"; + $left = "true"; } else { $alignm = "left"; - $left = "false"; + $left = "false"; } // Tooltip Options - $tt_opts = ", BALLOON," . $LB_TT_BALLOON ; - $tt_opts .= ", LEFT," . $left . ""; - $tt_opts .= ", ABOVE, true"; - $tt_opts .= ", TEXTALIGN, '" . $alignm . "'"; - $tt_opts .= ", WIDTH, -480 "; - $tt_opts .= ", BORDERCOLOR, ''"; - $tt_opts .= ", TITLEBGCOLOR, ''"; - $tt_opts .= ", CLOSEBTNTEXT, 'X'"; - $tt_opts .= ", CLOSEBTN, false"; - $tt_opts .= ", CLOSEBTNCOLORS, ['#ff0000', '#ffffff', '#ffffff', '#ff0000']"; - $tt_opts .= ", OFFSETX, -30"; - $tt_opts .= ", OFFSETY, 110"; - $tt_opts .= ", STICKY, true"; - $tt_opts .= ", PADDING, 6"; - $tt_opts .= ", CLICKCLOSE, true"; - $tt_opts .= ", DURATION, 8000"; - $tt_opts .= ", BGCOLOR, '#f3f3f3'"; - $tt_opts .= ", JUMPHORZ, 'true' "; - $tt_opts .= ", JUMPVERT, 'false' "; - $tt_opts .= ", DELAY, 0"; + $tt_opts = ", BALLOON," . $LB_TT_BALLOON ; + $tt_opts .= ", LEFT," . $left . ""; + $tt_opts .= ", ABOVE, true"; + $tt_opts .= ", TEXTALIGN, '" . $alignm . "'"; + $tt_opts .= ", WIDTH, -480 "; + $tt_opts .= ", BORDERCOLOR, ''"; + $tt_opts .= ", TITLEBGCOLOR, ''"; + $tt_opts .= ", CLOSEBTNTEXT, 'X'"; + $tt_opts .= ", CLOSEBTN, false"; + $tt_opts .= ", CLOSEBTNCOLORS, ['#ff0000', '#ffffff', '#ffffff', '#ff0000']"; + $tt_opts .= ", OFFSETX, -30"; + $tt_opts .= ", OFFSETY, 110"; + $tt_opts .= ", STICKY, true"; + $tt_opts .= ", PADDING, 6"; + $tt_opts .= ", CLICKCLOSE, true"; + $tt_opts .= ", DURATION, 8000"; + $tt_opts .= ", BGCOLOR, '#f3f3f3'"; + $tt_opts .= ", JUMPHORZ, 'true' "; + $tt_opts .= ", JUMPVERT, 'false' "; + $tt_opts .= ", DELAY, 0"; // Prepare Below Thumbnail menu ---------------------------------------------------- if ($TEXT_DIRECTION== "rtl") { - $submenu_class = "submenuitem_rtl"; - $submenu_hoverclass = "submenuitem_hover_rtl"; + $submenu_class = "submenuitem_rtl"; + $submenu_hoverclass = "submenuitem_hover_rtl"; } else { - $submenu_class = "submenuitem"; - $submenu_hoverclass = "submenuitem_hover"; + $submenu_class = "submenuitem"; + $submenu_hoverclass = "submenuitem_hover"; } $menu = new Menu(); // Truncate media title to 13 chars (45 chars if Streetview) and add ellipsis @@ -200,7 +200,7 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { if (strpos($rowm['m_file'], 'http://maps.google.')===0) { if (utf8_strlen($rawTitle)>16) $mtitle = utf8_substr($rawTitle, 0, 45).i18n::translate('…'); } else { - if (utf8_strlen($rawTitle)>16) $mtitle = utf8_substr($rawTitle, 0, 13).i18n::translate('…'); + if (utf8_strlen($rawTitle)>16) $mtitle = utf8_substr($rawTitle, 0, 13).i18n::translate('…'); } $mtitle = PrintReady(htmlspecialchars($mtitle)); diff --git a/modules/random_media/module.php b/modules/random_media/module.php index 633d8c451c..5b55c65673 100644 --- a/modules/random_media/module.php +++ b/modules/random_media/module.php @@ -262,9 +262,9 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block { function openPic(filename, width, height) { height=height+50; screenW = screen.width; - screenH = screen.height; - if (width>screenW-100) width=screenW-100; - if (height>screenH-110) height=screenH-120; + screenH = screen.height; + if (width>screenW-100) width=screenW-100; + if (height>screenH-110) height=screenH-120; if ((filename.search(/\.je?pg$/gi)!=-1)||(filename.search(/\.gif$/gi)!=-1)||(filename.search(/\.png$/gi)!=-1)||(filename.search(/\.bmp$/gi)!=-1)) win02 = window.open('imageview.php?filename='+filename,'win02','top=50,left=150,height='+height+',width='+width+',scrollbars=1,resizable=1'); // win03.resizeTo(winWidth 2,winHeight 30); diff --git a/modules/sitemap/index.php b/modules/sitemap/index.php index f32d45ccaf..4d7029ba54 100644 --- a/modules/sitemap/index.php +++ b/modules/sitemap/index.php @@ -48,27 +48,27 @@ if (!WT_USER_IS_ADMIN) { global $GEDCOM; -$action = safe_REQUEST($_REQUEST, 'action', WT_REGEX_XREF); -$welcome = safe_REQUEST($_REQUEST, 'welcome', WT_REGEX_XREF); -$gedcom_name = safe_REQUEST($_REQUEST, 'gedcom_name'); -$filename = safe_REQUEST($_REQUEST, 'filename'); -$filenames = safe_REQUEST($_REQUEST, 'filenames'); -$index = safe_REQUEST($_REQUEST, 'index'); -$welcome_priority = safe_REQUEST($_REQUEST, 'welcome_priority', WT_REGEX_XREF); -$welcome_update = safe_REQUEST($_REQUEST, 'welcome_update', WT_REGEX_XREF); -$indi_rec = safe_REQUEST($_REQUEST, 'indi_rec', WT_REGEX_XREF); -$indirec_priority = safe_REQUEST($_REQUEST, 'indirec_priority', WT_REGEX_XREF); -$indirec_update = safe_REQUEST($_REQUEST, 'indirec_update', WT_REGEX_XREF); -$indi_lists = safe_REQUEST($_REQUEST, 'indi_lists', WT_REGEX_XREF); -$indilist_priority = safe_REQUEST($_REQUEST, 'indilist_priority', WT_REGEX_XREF); -$indilist_update = safe_REQUEST($_REQUEST, 'indilist_update', WT_REGEX_XREF); -$fam_rec = safe_REQUEST($_REQUEST, 'fam_rec', WT_REGEX_XREF); -$famrec_priority = safe_REQUEST($_REQUEST, 'famrec_priority', WT_REGEX_XREF); -$famrec_update = safe_REQUEST($_REQUEST, 'famrec_update', WT_REGEX_XREF); -$fam_lists = safe_REQUEST($_REQUEST, 'fam_lists', WT_REGEX_XREF); -$famlist_priority = safe_REQUEST($_REQUEST, 'famlist_priority', WT_REGEX_XREF); -$famlist_update = safe_REQUEST($_REQUEST, 'famlist_update', WT_REGEX_XREF); -$no_private_links = safe_REQUEST($_REQUEST, 'no_private_links', '1', '0'); +$action = safe_REQUEST($_REQUEST, 'action', WT_REGEX_XREF); +$welcome = safe_REQUEST($_REQUEST, 'welcome', WT_REGEX_XREF); +$gedcom_name = safe_REQUEST($_REQUEST, 'gedcom_name'); +$filename = safe_REQUEST($_REQUEST, 'filename'); +$filenames = safe_REQUEST($_REQUEST, 'filenames'); +$index = safe_REQUEST($_REQUEST, 'index'); +$welcome_priority = safe_REQUEST($_REQUEST, 'welcome_priority', WT_REGEX_XREF); +$welcome_update = safe_REQUEST($_REQUEST, 'welcome_update', WT_REGEX_XREF); +$indi_rec = safe_REQUEST($_REQUEST, 'indi_rec', WT_REGEX_XREF); +$indirec_priority = safe_REQUEST($_REQUEST, 'indirec_priority', WT_REGEX_XREF); +$indirec_update = safe_REQUEST($_REQUEST, 'indirec_update', WT_REGEX_XREF); +$indi_lists = safe_REQUEST($_REQUEST, 'indi_lists', WT_REGEX_XREF); +$indilist_priority = safe_REQUEST($_REQUEST, 'indilist_priority', WT_REGEX_XREF); +$indilist_update = safe_REQUEST($_REQUEST, 'indilist_update', WT_REGEX_XREF); +$fam_rec = safe_REQUEST($_REQUEST, 'fam_rec', WT_REGEX_XREF); +$famrec_priority = safe_REQUEST($_REQUEST, 'famrec_priority', WT_REGEX_XREF); +$famrec_update = safe_REQUEST($_REQUEST, 'famrec_update', WT_REGEX_XREF); +$fam_lists = safe_REQUEST($_REQUEST, 'fam_lists', WT_REGEX_XREF); +$famlist_priority = safe_REQUEST($_REQUEST, 'famlist_priority', WT_REGEX_XREF); +$famlist_update = safe_REQUEST($_REQUEST, 'famlist_update', WT_REGEX_XREF); +$no_private_links = safe_REQUEST($_REQUEST, 'no_private_links', '1', '0'); if ($action=="sendFiles") { header('Content-Type: application/octet-stream'); @@ -77,21 +77,21 @@ if ($action=="sendFiles") { echo "<?xml version='1.0' encoding='UTF-8'?>\n"; echo "<?xml-stylesheet type=\"text/xsl\" href=\"", WT_SERVER_NAME.WT_SCRIPT_PATH, "modules/sitemap/gss.xsl\"?>\n"; echo "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n"; - echo " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; - echo " xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9\n"; - echo " http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd\">\n"; + echo " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; + echo " xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9\n"; + echo " http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd\">\n"; if (isset($welcome)) { - echo " <url>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "index.php?command=gedcom&ged=", urlencode($gedcom_name), "</loc>\n"; - echo " <changefreq>", $welcome_update, "</changefreq>\n"; - echo " <priority>0.", $welcome_priority, "</priority>\n"; - echo " </url>\n"; + echo " <url>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "index.php?command=gedcom&ged=", urlencode($gedcom_name), "</loc>\n"; + echo " <changefreq>", $welcome_update, "</changefreq>\n"; + echo " <priority>0.", $welcome_priority, "</priority>\n"; + echo " </url>\n"; } $oldGEDCOM = $GEDCOM; $GEDCOM = $gedcom_name; // Create a temporary userid - $sitemap_user_id = createTempUser('#SiteMap#', 'visitor', $gedcom_name); // Create a temporary userid + $sitemap_user_id = createTempUser('#SiteMap#', 'visitor', $gedcom_name); // Create a temporary userid // Temporarily become this user $_SESSION["org_user"]=$_SESSION["wt_user"]; $_SESSION["wt_user"]='#SiteMap#'; @@ -100,24 +100,24 @@ if ($action=="sendFiles") { while ($row=$statement->fetch(PDO::FETCH_NUM)) { if ($no_private_links) { if (canDisplayRecord($index, $row[1])) { - echo " <url>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "individual.php?pid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; + echo " <url>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "individual.php?pid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; $arec = get_sub_record(1, "1 CHAN", $row[1], 1); if (!empty($arec) && preg_match("/2 DATE (.*)/", $arec, $datematch)) - echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; - echo " <changefreq>", $indirec_update, "</changefreq>\n"; - echo " <priority>0.", $indirec_priority, "</priority>\n"; - echo " </url>\n"; + echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; + echo " <changefreq>", $indirec_update, "</changefreq>\n"; + echo " <priority>0.", $indirec_priority, "</priority>\n"; + echo " </url>\n"; } } else { - echo " <url>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "individual.php?pid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; + echo " <url>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "individual.php?pid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; $arec = get_sub_record(1, "1 CHAN", $row[1], 1); if (!empty($arec) && preg_match("/2 DATE (.*)/", $arec, $datematch)) - echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; - echo " <changefreq>", $indirec_update, "</changefreq>\n"; - echo " <priority>0.", $indirec_priority, "</priority>\n"; - echo " </url>\n"; + echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; + echo " <changefreq>", $indirec_update, "</changefreq>\n"; + echo " <priority>0.", $indirec_priority, "</priority>\n"; + echo " </url>\n"; } } $statement->closeCursor(); @@ -128,24 +128,24 @@ if ($action=="sendFiles") { while ($row=$statement->fetch(PDO::FETCH_NUM)) { if ($no_private_links) { if (canDisplayRecord($index, $row[1])) { - echo " <url>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "family.php?famid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; + echo " <url>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "family.php?famid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; $arec = get_sub_record(1, "1 CHAN", $row[1], 1); if (!empty($arec) && preg_match("/2 DATE (.*)/", $arec, $datematch)) - echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; - echo " <changefreq>", $indirec_update, "</changefreq>\n"; - echo " <priority>0.", $indirec_priority, "</priority>\n"; - echo " </url>\n"; + echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; + echo " <changefreq>", $indirec_update, "</changefreq>\n"; + echo " <priority>0.", $indirec_priority, "</priority>\n"; + echo " </url>\n"; } } else { - echo " <url>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "family.php?famid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; + echo " <url>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "family.php?famid=", $row[0], "&ged=", urlencode($gedcom_name), "</loc>\n"; $arec = get_sub_record(1, "1 CHAN", $row[1], 1); if (!empty($arec) && preg_match("/2 DATE (.*)/", $arec, $datematch)) - echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; - echo " <changefreq>", $indirec_update, "</changefreq>\n"; - echo " <priority>0.", $indirec_priority, "</priority>\n"; - echo " </url>\n"; + echo " <lastmod>", date("Y-m-d", strtotime($datematch[1])), "</lastmod>\n"; + echo " <changefreq>", $indirec_update, "</changefreq>\n"; + echo " <priority>0.", $indirec_priority, "</priority>\n"; + echo " </url>\n"; } } $statement->closeCursor(); @@ -154,11 +154,11 @@ if ($action=="sendFiles") { if (isset($fam_lists)) { foreach(get_indilist_salpha($SHOW_MARRIED_NAMES, true, $index) as $letter) { if ($letter!='@') { - echo " <url>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "famlist.php?alpha=", urlencode($letter), "&ged=", urlencode($gedcom_name), "</loc>\n"; - echo " <changefreq>", $famlist_update, "</changefreq>\n"; - echo " <priority>0.", $famlist_priority, "</priority>\n"; - echo " </url>\n"; + echo " <url>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "famlist.php?alpha=", urlencode($letter), "&ged=", urlencode($gedcom_name), "</loc>\n"; + echo " <changefreq>", $famlist_update, "</changefreq>\n"; + echo " <priority>0.", $famlist_priority, "</priority>\n"; + echo " </url>\n"; } } } @@ -166,11 +166,11 @@ if ($action=="sendFiles") { if (isset($indi_lists)) { foreach (get_indilist_salpha($SHOW_MARRIED_NAMES, false, $index) as $letter) { if ($letter!='@') { - echo " <url>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "indilist.php?alpha=", urlencode($letter), "&ged=", urlencode($gedcom_name), "</loc>\n"; - echo " <changefreq>", $indilist_update, "</changefreq>\n"; - echo " <priority>0.", $indilist_priority, "</priority>\n"; - echo " </url>\n"; + echo " <url>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "indilist.php?alpha=", urlencode($letter), "&ged=", urlencode($gedcom_name), "</loc>\n"; + echo " <changefreq>", $indilist_update, "</changefreq>\n"; + echo " <priority>0.", $indilist_priority, "</priority>\n"; + echo " </url>\n"; } } } @@ -197,10 +197,10 @@ if ($action=="sendIndex") { if (isset($filenames)) { foreach($filenames as $ged_index=>$ged_name) { $xml_name = str_ireplace(".ged",".xml", $ged_name); - echo " <sitemap>\n"; - echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "SM_", $xml_name, "</loc>\n"; - echo " <lastmod>", date("Y-m-d"), "</lastmod>\n "; - echo " </sitemap>\n"; + echo " <sitemap>\n"; + echo " <loc>", WT_SERVER_NAME, WT_SCRIPT_PATH, "SM_", $xml_name, "</loc>\n"; + echo " <lastmod>", date("Y-m-d"), "</lastmod>\n "; + echo " </sitemap>\n"; } } echo "</sitemapindex>\n"; @@ -271,7 +271,7 @@ if ($action=="") { <td class="optionbox" colspan="3"> <?php foreach (get_all_gedcoms() as $ged_id=>$gedcom) { - echo " <input type=\"checkbox\" name=\"GEDCOM_", $ged_id, "\" value=\"", $ged_id, "\" checked>", get_gedcom_setting($ged_id, 'title'), "<br />\n"; + echo " <input type=\"checkbox\" name=\"GEDCOM_", $ged_id, "\" value=\"", $ged_id, "\" checked>", get_gedcom_setting($ged_id, 'title'), "<br />\n"; } ?> </td> @@ -435,4 +435,3 @@ if ($action=="") { <?php } print_footer(); -?> diff --git a/modules/stories/module.php b/modules/stories/module.php index d70f972141..c3d942c22d 100644 --- a/modules/stories/module.php +++ b/modules/stories/module.php @@ -130,7 +130,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_ $html.='<div><a href="module.php?mod='.$this->getName().'&mod_action=edit&xref='.$this->controller->indi->getXref().'">'; $html.=i18n::translate('Add story').'</a>'.help_link('add_story', $this->getName()).'</div><br />'; } - return $html; + return $html; } // Implement class WT_Module_Tab @@ -177,7 +177,7 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_ )); $block_id=WT_DB::getInstance()->lastInsertId(); } - set_block_setting($block_id, 'title', safe_POST('title', WT_REGEX_UNSAFE)); // allow html + set_block_setting($block_id, 'title', safe_POST('title', WT_REGEX_UNSAFE)); // allow html set_block_setting($block_id, 'story_body', safe_POST('story_body', WT_REGEX_UNSAFE)); // allow html $languages=array(); foreach (i18n::installed_languages() as $code=>$name) { @@ -382,5 +382,5 @@ class stories_WT_Module extends WT_Module implements WT_Module_Block, WT_Module_ } echo '</table>'; print_footer(); - } + } } diff --git a/modules/todays_events/module.php b/modules/todays_events/module.php index 33cfb4a570..a71fc9f048 100644 --- a/modules/todays_events/module.php +++ b/modules/todays_events/module.php @@ -70,12 +70,12 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block { } else { $name = WT_USER_NAME; } - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; - $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>"; - } - $title.=i18n::translate('On This Day ...').help_link('index_onthisday'); + $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>"; + } + $title.=i18n::translate('On This Day ...').help_link('index_onthisday'); - $content = ""; + $content = ""; switch ($infoStyle) { case 'list': // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. @@ -165,4 +165,3 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block { echo '</td></tr>'; } } -?> diff --git a/modules/top10_givnnames/module.php b/modules/top10_givnnames/module.php index 691dbd8fb3..f887524e25 100644 --- a/modules/top10_givnnames/module.php +++ b/modules/top10_givnnames/module.php @@ -75,7 +75,7 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block { $content = '<div class="normal_inner_block">'; //Select List or Table switch ($infoStyle) { - case "list": // Output style 1: Simple list style. Better suited to left side of page. + case "list": // Output style 1: Simple list style. Better suited to left side of page. if ($TEXT_DIRECTION=='ltr') $padding = 'padding-left: 15px'; else $padding = 'padding-right: 15px'; $params=array(1,$num,'rcount'); @@ -95,7 +95,7 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block { $content.='<b>'.i18n::translate('Unknown').'</b><div class="wrap" style="'.$padding.'">'.$totals.'</div><br />'; } break; - case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page + case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page $params=array(1,$num,'rcount'); $content.='<table class="center"><tr valign="top"><td>'.$stats->commonGivenFemaleTable($params).'</td>'; $content.='<td>'.$stats->commonGivenMaleTable($params).'</td>'; @@ -175,4 +175,3 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block { echo '</td></tr>'; } } -?> diff --git a/modules/upcoming_events/module.php b/modules/upcoming_events/module.php index ff7bfaf852..1fe896105f 100644 --- a/modules/upcoming_events/module.php +++ b/modules/upcoming_events/module.php @@ -69,7 +69,7 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".i18n::translate('Configure')."\" /></a>"; } $title.= i18n::translate('Upcoming Events').help_link('upcoming_events', $this->getName()); @@ -173,4 +173,3 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block { echo '</td></tr>'; } } -?> diff --git a/modules/user_blog/module.php b/modules/user_blog/module.php index 9276d616c6..43bbc0ed00 100644 --- a/modules/user_blog/module.php +++ b/modules/user_blog/module.php @@ -35,7 +35,7 @@ require_once WT_ROOT.'includes/classes/class_module.php'; // Create tables, if not already present try { WT_DB::updateSchema('./modules/user_blog/db_schema/', 'NB_SCHEMA_VERSION', 1); -} catch (PDOException $ex) { +} catch (PDOException $ex) { // The schema update scripts should never fail. If they do, there is no clean recovery. die($ex); } diff --git a/modules/user_favorites/db_schema/db_schema_0_1.php b/modules/user_favorites/db_schema/db_schema_0_1.php index b48a514f5e..f9e87aa636 100644 --- a/modules/user_favorites/db_schema/db_schema_0_1.php +++ b/modules/user_favorites/db_schema/db_schema_0_1.php @@ -45,12 +45,12 @@ define('WT_FV_DB_SCHEMA_0_1', ''); WT_DB::exec( "CREATE TABLE IF NOT EXISTS `##favorites` (". " fv_id INTEGER AUTO_INCREMENT NOT NULL,". - " fv_username VARCHAR(32) NOT NULL,". + " fv_username VARCHAR(32) NOT NULL,". " fv_gid VARCHAR(20) NULL,". " fv_type VARCHAR(15) NULL,". " fv_file VARCHAR(100) NULL,". " fv_url VARCHAR(255) NULL,". - " fv_title VARCHAR(255) NULL,". + " fv_title VARCHAR(255) NULL,". " fv_note TEXT NULL,". " PRIMARY KEY (fv_id),". " KEY ix1 (fv_username)". diff --git a/modules/user_favorites/module.php b/modules/user_favorites/module.php index 1be5c1c09f..21084fc5b6 100644 --- a/modules/user_favorites/module.php +++ b/modules/user_favorites/module.php @@ -35,7 +35,7 @@ require_once WT_ROOT.'includes/classes/class_module.php'; // Create tables, if not already present try { WT_DB::updateSchema('./modules/user_favorites/db_schema/', 'FV_SCHEMA_VERSION', 1); -} catch (PDOException $ex) { +} catch (PDOException $ex) { // The schema update scripts should never fail. If they do, there is no clean recovery. die($ex); } @@ -165,8 +165,8 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block { } else $content = ''; if ($block) { - $style = 2; // 1 means "regular box", 2 means "wide box" - $tableWidth = ($BROWSERTYPE=="msie") ? "95%" : "99%"; // IE needs to have room for vertical scroll bar inside the box + $style = 2; // 1 means "regular box", 2 means "wide box" + $tableWidth = ($BROWSERTYPE=="msie") ? "95%" : "99%"; // IE needs to have room for vertical scroll bar inside the box $cellSpacing = "1px"; } else { $style = 2; @@ -314,7 +314,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block { /** * deleteFavorite * deletes a favorite in the database - * @param int $fv_id the id of the favorite to delete + * @param int $fv_id the id of the favorite to delete */ public static function deleteFavorite($fv_id) { return (bool) @@ -324,7 +324,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block { /** * stores a new favorite in the database - * @param array $favorite the favorite array of the favorite to add + * @param array $favorite the favorite array of the favorite to add */ public static function addFavorite($favorite) { // -- make sure a favorite is added @@ -357,7 +357,7 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block { /** * Get a user's favorites * Return an array of a users messages - * @param string $username the username to get the favorites for + * @param string $username the username to get the favorites for */ public static function getUserFavorites($username) { $rows= @@ -383,4 +383,3 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block { return $favorites; } } -?> diff --git a/themes/clouds/header.php b/themes/clouds/header.php index 49ced13b3b..7dcc08866b 100644 --- a/themes/clouds/header.php +++ b/themes/clouds/header.php @@ -120,7 +120,7 @@ if (empty($SEARCH_SPIDER)) { '</td>', '<td align="', $TEXT_DIRECTION=="ltr"?"left":"right", '" valign="middle" >'; ?> - <div style="white-space: normal;" align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right" ?>"> + <div style="white-space: normal;" align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right" ?>"> <?php echo '<form action="search.php" method="post">', '<input type="hidden" name="action" value="general" />', diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php index b52f00dbab..e17b207a34 100644 --- a/themes/clouds/theme.php +++ b/themes/clouds/theme.php @@ -183,32 +183,32 @@ $WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif'; //-- Variables for the Fan chart $fanChart = array( - 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', - 'size' => '7px', - 'color' => '#000000', - 'bgColor' => '#eeeeee', - 'bgMColor' => '#b1cff0', - 'bgFColor' => '#e9daf1' + 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', + 'size' => '7px', + 'color' => '#000000', + 'bgColor' => '#eeeeee', + 'bgMColor' => '#b1cff0', + 'bgFColor' => '#e9daf1' ); //-- This section defines variables for the pedigree chart -$bwidth = 225; // -- width of boxes on pedigree chart -$bheight = 78; // -- height of boxes on pedigree chart -$baseyoffset = -20; // -- position the entire pedigree tree relative to the top of the page -$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page -$bxspacing = 4; // -- horizontal spacing between boxes on the pedigree chart -$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart -$brborder = 1; // -- box right border thickness +$bwidth = 225; // -- width of boxes on pedigree chart +$bheight = 78; // -- height of boxes on pedigree chart +$baseyoffset = -20; // -- position the entire pedigree tree relative to the top of the page +$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page +$bxspacing = 4; // -- horizontal spacing between boxes on the pedigree chart +$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart +$brborder = 1; // -- box right border thickness // -- global variables for the descendancy chart -$Dbaseyoffset = 20; // -- position the entire descendancy tree relative to the top of the page -$Dbasexoffset = 20; // -- position the entire descendancy tree relative to the left of the page -$Dbxspacing = 0; // -- horizontal spacing between boxes -$Dbyspacing = 10; // -- vertical spacing between boxes -$Dbwidth = 250; // -- width of DIV layer boxes -$Dbheight = 78; // -- height of DIV layer boxes -$Dindent = 15; // -- width to indent descendancy boxes -$Darrowwidth = 30; // -- additional width to include for the up arrows +$Dbaseyoffset = 20; // -- position the entire descendancy tree relative to the top of the page +$Dbasexoffset = 20; // -- position the entire descendancy tree relative to the left of the page +$Dbxspacing = 0; // -- horizontal spacing between boxes +$Dbyspacing = 10; // -- vertical spacing between boxes +$Dbwidth = 250; // -- width of DIV layer boxes +$Dbheight = 78; // -- height of DIV layer boxes +$Dindent = 15; // -- width to indent descendancy boxes +$Darrowwidth = 30; // -- additional width to include for the up arrows $CHARTS_CLOSE_HTML = true; //-- should the charts, pedigree, descendacy, etc close the HTML on the page diff --git a/themes/colors/theme.php b/themes/colors/theme.php index 2dea3f1d5e..4e0ba09d69 100644 --- a/themes/colors/theme.php +++ b/themes/colors/theme.php @@ -242,32 +242,32 @@ $WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif'; //-- Variables for the Fan chart $fanChart = array( - 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', - 'size' => '7px', - 'color' => '#000000', - 'bgColor' => '#eeeeee', - 'bgMColor' => '#b1cff0', - 'bgFColor' => '#e9daf1' + 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', + 'size' => '7px', + 'color' => '#000000', + 'bgColor' => '#eeeeee', + 'bgMColor' => '#b1cff0', + 'bgFColor' => '#e9daf1' ); //-- This section defines variables for the pedigree chart -$bwidth = 225; // -- width of boxes on pedigree chart -$bheight = 78; // -- height of boxes on pedigree chart -$baseyoffset = -20; // -- position the entire pedigree tree relative to the top of the page -$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page -$bxspacing = 4; // -- horizontal spacing between boxes on the pedigree chart -$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart -$brborder = 1; // -- box right border thickness +$bwidth = 225; // -- width of boxes on pedigree chart +$bheight = 78; // -- height of boxes on pedigree chart +$baseyoffset = -20; // -- position the entire pedigree tree relative to the top of the page +$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page +$bxspacing = 4; // -- horizontal spacing between boxes on the pedigree chart +$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart +$brborder = 1; // -- box right border thickness // -- global variables for the descendancy chart -$Dbaseyoffset = 20; // -- position the entire descendancy tree relative to the top of the page -$Dbasexoffset = 20; // -- position the entire descendancy tree relative to the left of the page -$Dbxspacing = 0; // -- horizontal spacing between boxes -$Dbyspacing = 10; // -- vertical spacing between boxes -$Dbwidth = 250; // -- width of DIV layer boxes -$Dbheight = 78; // -- height of DIV layer boxes -$Dindent = 15; // -- width to indent descendancy boxes -$Darrowwidth = 30; // -- additional width to include for the up arrows +$Dbaseyoffset = 20; // -- position the entire descendancy tree relative to the top of the page +$Dbasexoffset = 20; // -- position the entire descendancy tree relative to the left of the page +$Dbxspacing = 0; // -- horizontal spacing between boxes +$Dbyspacing = 10; // -- vertical spacing between boxes +$Dbwidth = 250; // -- width of DIV layer boxes +$Dbheight = 78; // -- height of DIV layer boxes +$Dindent = 15; // -- width to indent descendancy boxes +$Darrowwidth = 30; // -- additional width to include for the up arrows $CHARTS_CLOSE_HTML = true; //-- should the charts, pedigree, descendacy, etc close the HTML on the page diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php index 5198a780bb..cf67005581 100644 --- a/themes/minimal/theme.php +++ b/themes/minimal/theme.php @@ -117,7 +117,7 @@ $WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif'; $WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif'; $WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif'; $WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif'; -$WT_IMAGES['remove'] = WT_THEME_DIR.'images/remove.gif'; +$WT_IMAGES['remove'] = WT_THEME_DIR.'images/remove.gif'; $WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif'; $WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif'; $WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif'; @@ -145,34 +145,34 @@ $WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif'; //-- Variables for the Fan chart $fanChart = array( - 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', - 'size' => '7px', - 'color' => '#000000', - 'bgColor' => '#eeeeee', - 'bgMColor' => '#cccccc', - 'bgFColor' => '#dddddd' + 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', + 'size' => '7px', + 'color' => '#000000', + 'bgColor' => '#eeeeee', + 'bgMColor' => '#cccccc', + 'bgFColor' => '#dddddd' ); //-- This section defines variables for the pedigree chart -$bwidth = 225; // -- width of boxes on pedigree chart -$bheight = 80; // -- height of boxes on pedigree chart -$baseyoffset = 10; // -- position the entire pedigree tree relative to the top of the page -$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page -$bxspacing = 0; // -- horizontal spacing between boxes on the pedigree chart -$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart -$brborder = 1; // -- box right border thickness +$bwidth = 225; // -- width of boxes on pedigree chart +$bheight = 80; // -- height of boxes on pedigree chart +$baseyoffset = 10; // -- position the entire pedigree tree relative to the top of the page +$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page +$bxspacing = 0; // -- horizontal spacing between boxes on the pedigree chart +$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart +$brborder = 1; // -- box right border thickness // -- global variables for the descendancy chart -$Dbaseyoffset = 0; // -- position the entire descendancy tree relative to the top of the page -$Dbasexoffset = 0; // -- position the entire descendancy tree relative to the left of the page -$Dbxspacing = 0; // -- horizontal spacing between boxes -$Dbyspacing = 1; // -- vertical spacing between boxes -$Dbwidth = 270; // -- width of DIV layer boxes -$Dbheight = 80; // -- height of DIV layer boxes -$Dindent = 15; // -- width to indent descendancy boxes -$Darrowwidth = 15; // -- additional width to include for the up arrows +$Dbaseyoffset = 0; // -- position the entire descendancy tree relative to the top of the page +$Dbasexoffset = 0; // -- position the entire descendancy tree relative to the left of the page +$Dbxspacing = 0; // -- horizontal spacing between boxes +$Dbyspacing = 1; // -- vertical spacing between boxes +$Dbwidth = 270; // -- width of DIV layer boxes +$Dbheight = 80; // -- height of DIV layer boxes +$Dindent = 15; // -- width to indent descendancy boxes +$Darrowwidth = 15; // -- additional width to include for the up arrows -$CHARTS_CLOSE_HTML = true; //-- should the charts, pedigree, descendacy, etc close the HTML on the page +$CHARTS_CLOSE_HTML = true; //-- should the charts, pedigree, descendacy, etc close the HTML on the page // -- The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X = "440"; diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php index 553001a4ec..04f2cf9c80 100644 --- a/themes/webtrees/header.php +++ b/themes/webtrees/header.php @@ -72,7 +72,7 @@ if ($view!="simple") { echo '<meta name="generator" content="', WT_WEBTREES, ' - ', WT_WEBTREES_URL, '" />'; } echo - $javascript, + $javascript, '<script type="text/javascript" src="js/jquery/jquery.min.js"></script>', '<script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script>', '<script type="text/javascript" src="js/jquery/jquery.tablesorter.js"></script>', @@ -129,7 +129,7 @@ if ($view!='simple') { '<input type="text" name="query" size="15" value="', i18n::translate('Search'), '"', 'onfocus="if (this.value==\'', i18n::translate('Search'), '\') this.value=\'\'; focusHandler();"', 'onblur="if (this.value==\'\') this.value=\'', i18n::translate('Search'), '\';" />', - '<input type="image" src="', $WT_IMAGES['search'], '" width="17" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />', + '<input type="image" src="', $WT_IMAGES['search'], '" width="17" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />', '</form>'; } echo '</td>', diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php index db26335240..9667878724 100644 --- a/themes/xenea/theme.php +++ b/themes/xenea/theme.php @@ -144,7 +144,7 @@ $WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif'; $WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif'; $WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif'; $WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif'; -$WT_IMAGES['remove'] = WT_THEME_DIR.'images/remove.gif'; +$WT_IMAGES['remove'] = WT_THEME_DIR.'images/remove.gif'; $WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif'; $WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif'; $WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif'; @@ -172,34 +172,34 @@ $WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif'; //-- Variables for the Fan chart $fanChart = array( - 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', - 'size' => '7px', - 'color' => '#000000', - 'bgColor' => '#eeeeee', - 'bgMColor' => '#b1cff0', - 'bgFColor' => '#e9daf1' + 'font' => WT_ROOT.'includes/fonts/DejaVuSans.ttf', + 'size' => '7px', + 'color' => '#000000', + 'bgColor' => '#eeeeee', + 'bgMColor' => '#b1cff0', + 'bgFColor' => '#e9daf1' ); //-- This section defines variables for the pedigree chart -$bwidth = 220; // -- width of boxes on pedigree chart -$bheight = 80; // -- height of boxes on pedigree chart -$baseyoffset = 10; // -- position the entire pedigree tree relative to the top of the page -$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page -$bxspacing = 1; // -- horizontal spacing between boxes on the pedigree chart -$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart -$brborder = 1; // -- box right border thickness +$bwidth = 220; // -- width of boxes on pedigree chart +$bheight = 80; // -- height of boxes on pedigree chart +$baseyoffset = 10; // -- position the entire pedigree tree relative to the top of the page +$basexoffset = 10; // -- position the entire pedigree tree relative to the left of the page +$bxspacing = 1; // -- horizontal spacing between boxes on the pedigree chart +$byspacing = 5; // -- vertical spacing between boxes on the pedigree chart +$brborder = 1; // -- box right border thickness // -- global variables for the descendancy chart -$Dbaseyoffset = 0; // -- position the entire descendancy tree relative to the top of the page -$Dbasexoffset = 0; // -- position the entire descendancy tree relative to the left of the page -$Dbxspacing = 1; // -- horizontal spacing between boxes -$Dbyspacing = 2; // -- vertical spacing between boxes -$Dbwidth = 270; // -- width of DIV layer boxes -$Dbheight = 80; // -- height of DIV layer boxes -$Dindent = 15; // -- width to indent descendancy boxes -$Darrowwidth = 15; // -- additional width to include for the up arrows +$Dbaseyoffset = 0; // -- position the entire descendancy tree relative to the top of the page +$Dbasexoffset = 0; // -- position the entire descendancy tree relative to the left of the page +$Dbxspacing = 1; // -- horizontal spacing between boxes +$Dbyspacing = 2; // -- vertical spacing between boxes +$Dbwidth = 270; // -- width of DIV layer boxes +$Dbheight = 80; // -- height of DIV layer boxes +$Dindent = 15; // -- width to indent descendancy boxes +$Darrowwidth = 15; // -- additional width to include for the up arrows -$CHARTS_CLOSE_HTML = true; //-- should the charts, pedigree, descendacy, etc close the HTML on the page +$CHARTS_CLOSE_HTML = true; //-- should the charts, pedigree, descendacy, etc close the HTML on the page // -- The largest possible area for charts is 300,000 pixels. As the maximum height or width is 1000 pixels $WT_STATS_S_CHART_X = "440"; |