diff options
55 files changed, 399 insertions, 404 deletions
diff --git a/addmedia.php b/addmedia.php index 55b31ff0e3..0aa983d502 100644 --- a/addmedia.php +++ b/addmedia.php @@ -357,7 +357,7 @@ if ($action=="newentry") { if (!$isThum) { echo i18n::translate( - 'Thumbnail file %s does not exist.', + 'Thumbnail file %s does not exist.', '<span class="filename">'.str_replace($MEDIA_DIRECTORY, $MEDIA_DIRECTORY."thumbs/", $oldFolder).$oldFilename.'</span>' ); } else { @@ -523,7 +523,7 @@ if ($action == "update") { if (!$isThum) { echo i18n::translate( - 'Thumbnail file %s does not exist.', + 'Thumbnail file %s does not exist.', '<span class="filename">'.str_replace($MEDIA_DIRECTORY, $MEDIA_DIRECTORY."thumbs/", $oldFolder).$oldFilename.'</span>' ); } else { @@ -100,9 +100,9 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN } ?></td> </tr> - + <tr><td colspan="2"> - + <div id="tabs" class="width100"> <!-- Tabs --> <ul> @@ -111,7 +111,7 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN <li><a href="#site"><span><?php echo i18n::translate('Site administration')?></span></a></li> <?php } ?> <li><a href="#gedcom"><span><?php echo i18n::translate('Data and GEDCOM administration')?></span></a></li> - <?php + <?php $modules = WT_Module::getInstalledModules(); if (WT_USER_IS_ADMIN || count($modules)>0) {?> <li><a href="#modules" onclick="window.location='module_admin.php';" ><span><?php echo i18n::translate('Module administration')?></span></a></li> @@ -120,8 +120,8 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN <!-- Other admin --> <div id="info"> <table class="center <?php echo $TEXT_DIRECTION ?> width100"> - <tr> - <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Informational'); ?></td> + <tr> + <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Informational'); ?></td> </tr> <tr> <td class="optionbox width50"> @@ -132,10 +132,10 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN <?php echo help_link('phpinfo'); ?> </td> </tr> - <?php if (WT_USER_CAN_EDIT) { + <?php if (WT_USER_CAN_EDIT) { ?> - <tr> - <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Unlinked Records'); ?></td> + <tr> + <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Unlinked Records'); ?></td> </tr> <tr> <td class="optionbox with50"> @@ -155,15 +155,15 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN </tr> </table> </div> - <?php - } - if (WT_USER_IS_ADMIN) { + <?php + } + if (WT_USER_IS_ADMIN) { ?> - <!-- Site admin --> + <!-- Site admin --> <div id="site"> <table class="center <?php echo $TEXT_DIRECTION ?> width100"> - <tr> - <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Site administration'); ?></td> + <tr> + <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Site administration'); ?></td> </tr> <tr> <td class="optionbox width50"><a @@ -180,12 +180,12 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN </div> <?php } ?> - <!-- GEDCOM admin --> + <!-- GEDCOM admin --> <div id="gedcom"> <table class="center <?php echo $TEXT_DIRECTION ?> width100"> - <tr> - <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Data and GEDCOM administration'); ?></td> - </tr> + <tr> + <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Data and GEDCOM administration'); ?></td> + </tr> <tr> <td class="optionbox width50"><a href="editgedcoms.php"><?php echo i18n::translate('GEDCOM administration');?></a><?php echo help_link('gedcom_administration'); ?></td> @@ -197,8 +197,8 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN <td class="optionbox width50"><?php if (WT_USER_CAN_EDIT) { echo '<a href="module.php?mod=batch_update&mod_action=batch_update">', i18n::translate('Batch Update'), '</a>', help_link('help_batch_update.php'); } ?></td> </tr> <?php if ($pending_changes) { ?> - <tr> - <td colspan="2" class="optionbox" style="text-align:center; "><?php echo $d_wt_changes; ?></td> + <tr> + <td colspan="2" class="optionbox" style="text-align:center; "><?php echo $d_wt_changes; ?></td> </tr> <?php } ?> </table> @@ -207,14 +207,14 @@ echo WT_JS_START, 'function showchanges() {window.location.reload();}', WT_JS_EN <?php if (WT_USER_IS_ADMIN || count($modules)>0) { echo '<div id="modules">'; // Added by BH ------------------------ - echo i18n::translate('Loading...'); + echo i18n::translate('Loading...'); // ------------------------------------ echo '</div>'; } ?> </div> </td> </tr></table> - <?php + <?php echo WT_JS_START; echo 'function manageservers() {'; echo ' window.open("manageservers.php", "", "top=50,left=50,width=700,height=500,scrollbars=1,resizable=1");'; diff --git a/autocomplete.php b/autocomplete.php index b158fd927a..825c47a102 100644 --- a/autocomplete.php +++ b/autocomplete.php @@ -712,7 +712,7 @@ function get_autocomplete_OBJE($FILTER, $ged_id=WT_GED_ID) { } function get_autocomplete_SURN($FILTER, $ged_id=WT_GED_ID) { - return + return WT_DB::prepare( "SELECT DISTINCT n_surname". " FROM `##name`". @@ -724,7 +724,7 @@ function get_autocomplete_SURN($FILTER, $ged_id=WT_GED_ID) { } function get_autocomplete_GIVN($FILTER, $ged_id=WT_GED_ID) { - return + return WT_DB::prepare( "SELECT DISTINCT n_givn". " FROM `##name`". @@ -736,8 +736,7 @@ function get_autocomplete_GIVN($FILTER, $ged_id=WT_GED_ID) { } function get_autocomplete_PLAC($FILTER, $ged_id=WT_GED_ID) { - - return + return WT_DB::prepare( "SELECT p1.p_place". " FROM `##places` p1". diff --git a/branches.php b/branches.php index 6839c8fa22..7621695316 100644 --- a/branches.php +++ b/branches.php @@ -144,7 +144,7 @@ function print_fams($person, $famid=null) { } $current = $person->getSexImage(). "<a target=\"_blank\" class=\"{$class}\" title=\"".$person->getXref()."\" href=\"{$person->getLinkUrl()}\">".PrintReady($person_name)."</a> ". - $person->getBirthDeathYears()." {$sosa}"; + $person->getBirthDeathYears()." {$sosa}"; if ($famid && $person->getChildFamilyPedigree($famid)) { $sex = $person->getSex(); $famcrec = get_sub_record(1, "1 FAMC @".$famid."@", $person->getGedcomRecord()); diff --git a/compact.php b/compact.php index 87a76cd8ff..1cda433370 100644 --- a/compact.php +++ b/compact.php @@ -334,13 +334,11 @@ function print_td_person($n) { $text = "<img src=\""; if ($sex == 'F') { $text .= $WT_IMAGES["default_image_F"]; - } - else if ($sex == 'M') { + } else if ($sex == 'M') { $text .= $WT_IMAGES["default_image_M"]; - } - else { + } else { $text .= $WT_IMAGES["default_image_U"]; - } + } $text .="\" class=\"".$class."\" border=\"none\" alt=\"\" />"; } } diff --git a/edit_interface.php b/edit_interface.php index 0978927fb7..bacdaeceec 100644 --- a/edit_interface.php +++ b/edit_interface.php @@ -941,11 +941,11 @@ case 'addnoteaction': } // $xref = "Test"; $xref = append_gedrec($newgedrec, WT_GED_ID); - + // Not sure if next line is needed ?? BH ?? -------- // $link = "note.php?nid=$xref&show_changes=yes"; // ------------------------------------------------- - + if ($xref != "none") { echo "<br /><br />\n".i18n::translate('New Shared Note created successfully.')." (".$xref.")<br /><br />"; echo "<a href=\"javascript://NOTE $xref\" onclick=\"openerpasteid('$xref'); return false;\">".i18n::translate('Paste the following ID into your editing fields to reference the newly created record ')." <b>$xref</b></a>\n"; @@ -958,7 +958,7 @@ case 'addnoteaction': case 'addnewnote_assisted': if (isset($_REQUEST['pid'])) $pid = $_REQUEST['pid']; global $pid; - + echo WT_JS_START; ?> function check_form(frm) { @@ -974,7 +974,7 @@ case 'addnewnote_assisted': <?php echo WT_JS_END; ?> - + <div class="center font11" style="width:100%;"> <b><?php echo i18n::translate('Create a new Shared Note using Assistant'); $tabkey = 1; ?></b> <form method="post" action="edit_interface.php" onsubmit="return check_form(this);"> @@ -995,7 +995,7 @@ case 'addnewnote_assisted': case 'addnoteaction_assisted': require WT_ROOT.'modules/GEDFact_assistant/_CENS/addnoteaction_assisted.php'; break; - + //-- add new Media Links case 'addmedia_links': global $pid; @@ -1014,9 +1014,9 @@ case 'addmedia_links': ?> <!-- <form method="post" action="edit_interface.php" onsubmit="return check_form(this);"> --> <form method="post" action="edit_interface.php?pid=<?php echo $pid; ?>" onsubmit="findindi()"> - <input type="hidden" name="action" value="addmedia_links" /> - <input type="hidden" name="noteid" value="newnote" /> - <!-- <input type="hidden" name="pid" value="<?php // echo $pid; ?>" /> --> + <input type="hidden" name="action" value="addmedia_links" /> + <input type="hidden" name="noteid" value="newnote" /> + <!-- <input type="hidden" name="pid" value="<?php // echo $pid; ?>" /> --> <?php require WT_ROOT.'modules/GEDFact_assistant/MEDIA_ctrl.php'; ?> @@ -1059,7 +1059,7 @@ case 'editsource': $level1type = create_edit_form($gedrec, $lines++, $level0type); echo "<input type=\"hidden\" name=\"linenum[]\" value=\"$i\" />\n"; } - + if (WT_USER_IS_ADMIN) { echo "<tr><td class=\"descriptionbox ", $TEXT_DIRECTION, " wrap width25\">"; echo i18n::translate('Admin Option'), help_link('no_update_CHAN'), "</td><td class=\"optionbox wrap\">\n"; @@ -1120,7 +1120,7 @@ case 'editnote': ?></textarea><br /><?php print_specialchar_link("NOTE", true); ?> </td> </tr> - <?php $tabkey++; + <?php $tabkey++; if (WT_USER_IS_ADMIN) { echo "<tr><td class=\"descriptionbox ", $TEXT_DIRECTION, " wrap width25\">"; echo i18n::translate('Admin Option'), help_link('no_update_CHAN'), "</td><td class=\"optionbox wrap\">\n"; @@ -1269,14 +1269,14 @@ case 'updateraw': $success = true; } break; - + //---------------------------------------------------------------------------------- //-- reconstruct the gedcom from the incoming fields and store it in the file case 'update': /* ----------------------------------------------------------------------------- - * $pids_array is a text file passed via js from the CENS GEDFact Assistant + * $pids_array is a text file passed via js from the CENS GEDFact Assistant * to the hidden field id=\"pids_array\" in the case 'add'. - * The subsequent array ($cens_pids), after exploding this text file, + * The subsequent array ($cens_pids), after exploding this text file, * is an array of indi id's within the Census Transcription * If $cens_pids is set, then this allows the array to "copy" the new CENS event * using the foreach loop to these id's @@ -1305,7 +1305,7 @@ case 'update': } else if (isset($famid)) { $gedrec = find_gedcom_record($famid, WT_GED_ID, true); } - + if (WT_DEBUG) { phpinfo(INFO_VARIABLES); echo "<pre>$gedrec</pre>"; @@ -1467,18 +1467,18 @@ case 'update': if (!empty($_AKA)) $newged .= "2 _AKA $_AKA\n"; if (!empty($_MARNM)) $newged .= "2 _MARNM $_MARNM\n"; - + $newged = handle_updates($newged); $current = $editline; break; } - + } if (WT_DEBUG) { echo "<br /><br />"; echo "<pre>$newged</pre>"; } - + replace_gedrec($pid, WT_GED_ID, $newged, $update_CHAN); $success = true; } // end foreach $cens_pids ------------- @@ -2062,7 +2062,7 @@ case 'reset_media_update': // Reset sort using popup //------------------------------------------------------------------------------ case 'reorder_media_update': // Update sort using popup - + if (WT_DEBUG) { phpinfo(INFO_VARIABLES); } @@ -2212,7 +2212,7 @@ case 'reorder_children': } } ); - <?php echo WT_JS_END; + <?php echo WT_JS_END; if (WT_USER_IS_ADMIN) { echo "<center><table width=93%><tr><td class=\"descriptionbox ", $TEXT_DIRECTION, " wrap width25\">"; echo i18n::translate('Admin Option'), help_link('no_update_CHAN'), "</td><td class=\"optionbox ", $TEXT_DIRECTION, " wrap\">\n"; @@ -2620,7 +2620,7 @@ case 'mod_edit_fact': // Redirect to new record, if requested -if (isset($_REQUEST['goto'])) { +if (isset($_REQUEST['goto'])) { $goto = $_REQUEST['goto']; } if (isset($_REQUEST['link'])) { diff --git a/editconfig_gedcom.php b/editconfig_gedcom.php index 2b5860949d..6d77062894 100644 --- a/editconfig_gedcom.php +++ b/editconfig_gedcom.php @@ -759,7 +759,7 @@ print_header(i18n::translate('GEDCOM configuration')); </td> </tr> <?php - + $all_tags=array(); $tags=array_unique(array_merge( explode(',', get_gedcom_setting(WT_GED_ID, 'INDI_FACTS_ADD')), explode(',', get_gedcom_setting(WT_GED_ID, 'INDI_FACTS_UNIQUE')), @@ -777,7 +777,7 @@ print_header(i18n::translate('GEDCOM configuration')); } uasort($all_tags, 'utf8_strcasecmp'); - + echo '<tr><td class="optionbox" width="*">'; echo '<input type="text" class="pedigree_form" name="xref" id="xref" size="6" />'; print_findindi_link("xref",""); diff --git a/editgedcoms.php b/editgedcoms.php index f5b4071a07..173c930db4 100644 --- a/editgedcoms.php +++ b/editgedcoms.php @@ -65,7 +65,7 @@ function import_gedcom_file($gedcom_id, $file_name) { // CONCAT(import_gedcom, ?) // See http://bugs.mysql.com/bug.php?id=22853 (Scheduled to be fixed in MySQL 6) try { - WT_DB::exec("SET @@max_allowed_packet=".max($file_size*2, $max_allowed_packet)); + WT_DB::exec("SET @@max_allowed_packet=".max($file_size*2, $max_allowed_packet)); } catch (PDOException $ex) { // We can only set this on MySQL 5.1.30 or earlier } @@ -349,7 +349,7 @@ if (WT_USER_IS_ADMIN) { '</form>', '</td>', '</tr></table><br/>'; - + // display link to PGV-WT transfer wizard on first visit to this page, before any GEDCOM is loaded if (count($gedcoms)==0 && get_user_count()==1) { echo @@ -359,6 +359,6 @@ if (WT_USER_IS_ADMIN) { '</a>', help_link('PGV_WIZARD'), '</div>'; - } + } } print_footer(); diff --git a/editnews.php b/editnews.php index 51a1039dda..739b4b5a1d 100644 --- a/editnews.php +++ b/editnews.php @@ -28,7 +28,7 @@ define('WT_SCRIPT_NAME', 'editnews.php'); require './includes/session.php'; - + print_simple_header(i18n::translate('Add/edit journal/news entry')); if (!WT_USER_ID) { @@ -56,7 +56,7 @@ if ($action=="compose") { document.messageform.title.focus(); return false; } - <?php if (!array_key_exists('ckeditor', WT_Module::getActiveModules())) { //will be empty for FCK. FIXME, use FCK API to check for content. + <?php if (!array_key_exists('ckeditor', WT_Module::getActiveModules())) { //will be empty for FCK. FIXME, use FCK API to check for content. ?> if (frm.text.value=="") { alert('<?php print i18n::translate('Please enter some text for this News or Journal entry.'); ?>'); @@ -446,7 +446,7 @@ if ($type == "facts") { echo "<table class=\"list_table $TEXT_DIRECTION width100\" border=\"0\">"; echo "<tr><td class=\"list_label $TEXT_DIRECTION\" style=\"padding: 5px; font-weight: normal; white-space: normal;\">"; getPreselectedTags($preselDefault, $preselCustom); - ?> + ?> <?php echo WT_JS_START; ?> // A class representing a default tag function DefaultTag(id, name, selected) { @@ -464,9 +464,9 @@ if ($type == "facts") { o=null; if(document.all) { //Old IEs handle the creation of a checkbox already checked, as far as I know, only in this way - try { - o=document.createElement("<input type='checkbox' id='tag"+this._counter+"' "+(this.selected?"checked='checked'":"")+" />"); - } catch(e) { + try { + o=document.createElement("<input type='checkbox' id='tag"+this._counter+"' "+(this.selected?"checked='checked'":"")+" />"); + } catch(e) { o=null; } } diff --git a/import.php b/import.php index b91dd20b8c..350984c3bb 100644 --- a/import.php +++ b/import.php @@ -68,7 +68,7 @@ header('Content-type: text/html; charset=UTF-8'); // See http://bugs.mysql.com/bug.php?id=22853 $max_allowed_packet=WT_DB::prepare("SELECT @@max_allowed_packet")->fetchOne(); try { - WT_DB::exec("SET @@max_allowed_packet=".max($row->import_total*2, $max_allowed_packet)); + WT_DB::exec("SET @@max_allowed_packet=".max($row->import_total*2, $max_allowed_packet)); } catch (PDOException $ex) { // We can only set this on MySQL 5.1.30/5.0.83 or earlier } @@ -81,7 +81,7 @@ if ($row->import_offset==0 || $row->import_total==0) { 'jQuery("#import', $gedcom_id, '").toggle();', 'jQuery("#actions', $gedcom_id, '").toggle();', WT_JS_END; - exit; + exit; } // Calculate progress so far @@ -145,7 +145,7 @@ for ($end_time=microtime(true)+1.0; microtime(true)<$end_time; ) { " SET import_gedcom=CONVERT(CONVERT(import_gedcom USING ascii) USING utf8)". " WHERE gedcom_id=?" )->execute(array($gedcom_id)); - break; + break; case 'IBMPC': // IBMPC and MS_DOS could be anything. Mostly it means CP850. case 'MS-DOS': case 'CP437': @@ -156,10 +156,10 @@ for ($end_time=microtime(true)+1.0; microtime(true)<$end_time; ) { " SET import_gedcom=CONVERT(CONVERT(import_gedcom USING cp850) USING utf8)". " WHERE gedcom_id=?" )->execute(array($gedcom_id)); - break; + break; case 'ANSI': // ANSI could be anything. Most applications seem to treat it as latin1. echo - WT_JS_START, + WT_JS_START, 'alert("', /* I18N: %1$s and %2$s are the names of character encodings, such as ISO-8859-1 or ASCII */ i18n::translate('This GEDCOM is encoded using %1$s. Assume this to mean %2$s.', $charset, 'ISO-8859-1'), '");', WT_JS_END; case 'CP1252': @@ -173,7 +173,7 @@ for ($end_time=microtime(true)+1.0; microtime(true)<$end_time; ) { " SET import_gedcom=CONVERT(CONVERT(import_gedcom USING latin1) USING utf8)". " WHERE gedcom_id=?" )->execute(array($gedcom_id)); - break; + break; case 'CP1250': case 'ISO8859-2': case 'ISO-8859-2': @@ -185,7 +185,7 @@ for ($end_time=microtime(true)+1.0; microtime(true)<$end_time; ) { " SET import_gedcom=CONVERT(CONVERT(import_gedcom USING latin2) USING utf8)". " WHERE gedcom_id=?" )->execute(array($gedcom_id)); - break; + break; case 'MACINTOSH': // Convert from MAC Roman to UTF8. WT_DB::prepare( @@ -193,7 +193,7 @@ for ($end_time=microtime(true)+1.0; microtime(true)<$end_time; ) { " SET import_gedcom=CONVERT(CONVERT(import_gedcom USING macroman) USING utf8)". " WHERE gedcom_id=?" )->execute(array($gedcom_id)); - break; + break; case 'UTF8': case 'UTF-8': // Already UTF-8 so nothing to do! diff --git a/includes/classes/class_date.php b/includes/classes/class_date.php index 359e979a28..5368d8c68d 100644 --- a/includes/classes/class_date.php +++ b/includes/classes/class_date.php @@ -922,7 +922,7 @@ class HebrewDate extends JewishDate { const GERSHAYIM="״"; const GERSH="׳"; const ALAFIM="אלפים"; - + function FormatDayZeros() { return $this->NumToHebrew($this->d); } @@ -972,17 +972,17 @@ class HebrewDate extends JewishDate { // Hebrew does not have genitive forms return self::NUM_TO_MONTH_NOMINATIVE($n, $leap_year); } - + static function NUM_TO_MONTH_LOCATIVE($n, $leap_year) { // Hebrew does not have locative forms return self::NUM_TO_MONTH_NOMINATIVE($n, $leap_year); } - + static function NUM_TO_MONTH_INSTRUMENTAL($n, $leap_year) { // Hebrew does not have instrumental forms return self::NUM_TO_MONTH_NOMINATIVE($n, $leap_year); } - + static function NUM_TO_SHORT_MONTH($n, $leap_year) { // TODO: Do these have short names? return self::NUM_TO_MONTH_NOMINATIVE($n, $leap_year); @@ -1375,12 +1375,12 @@ class ArabicDate extends HijriDate { // Arabic does not have locative forms return self::NUM_TO_MONTH_NOMINATIVE($n, $leap_year); } - + static function NUM_TO_MONTH_INSTRUMENTAL($n, $leap_year) { // Arabic does not have instrumental forms return self::NUM_TO_MONTH_NOMINATIVE($n, $leap_year); } - + static function NUM_TO_SHORT_MONTH($n, $leap_year) { // TODO: Do these have short names? return self::NUM_TO_MONTH_NOMINATIVE($n, $leap_year); diff --git a/includes/classes/class_gedcomrecord.php b/includes/classes/class_gedcomrecord.php index 4758724773..8c4bbba4c8 100644 --- a/includes/classes/class_gedcomrecord.php +++ b/includes/classes/class_gedcomrecord.php @@ -382,7 +382,7 @@ class GedcomRecord { " FROM `##change`". " WHERE status='pending' AND gedcom_id=? AND xref=?". " ORDER BY change_id desc". - " LIMIT 1" + " LIMIT 1" )->execute(array($this->ged_id, $this->xref))->fetchOne(); return $tmp===''; diff --git a/includes/classes/class_i18n.php b/includes/classes/class_i18n.php index a34ea927c9..ffee5873bd 100644 --- a/includes/classes/class_i18n.php +++ b/includes/classes/class_i18n.php @@ -315,7 +315,7 @@ class i18n { // I18N: Description of someone's age at an event. e.g Died 14 Jan 1900 (aged more than 21 years) return i18n::translate('(aged more than %s)', $age); } else { - // I18N: Description of someone's age at an event. e.g Died 14 Jan 1900 (aged 43 years) + // I18N: Description of someone's age at an event. e.g Died 14 Jan 1900 (aged 43 years) return i18n::translate('(aged %s)', $age); } } else { diff --git a/includes/classes/class_menubar.php b/includes/classes/class_menubar.php index ef0d5862ce..422f9b6b94 100644 --- a/includes/classes/class_menubar.php +++ b/includes/classes/class_menubar.php @@ -184,7 +184,7 @@ class MenuBar global $TEXT_DIRECTION, $WT_IMAGES, $SEARCH_SPIDER; global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT; global $controller; - + $style = "top"; if ($rootid) $style = "sub"; if (isset($controller)) { @@ -325,7 +325,7 @@ class MenuBar $menuList["childTimeLine"] = i18n::translate('Show children on timeline chart'); $menuList["familyTimeLine"] = i18n::translate('Show family on timeline chart'); asort($menuList); - + // Produce the submenus in localized name order foreach($menuList as $menuType => $menuName) { switch ($menuType) { @@ -338,7 +338,7 @@ class MenuBar $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}"); $menu->addSubmenu($submenu); break; - + case "childTimeLine": // charts / children_timeline $submenu = new Menu(i18n::translate('Show children on timeline chart'), encode_url('timeline.php?'.$controller->getChildrenUrlTimeline())); @@ -348,7 +348,7 @@ class MenuBar $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}"); $menu->addSubmenu($submenu); break; - + case "familyTimeLine": // charts / family_timeline $submenu = new Menu(i18n::translate('Show family on timeline chart'), encode_url('timeline.php?pids[0]='.$controller->getHusband().'&pids[1]='.$controller->getWife().'&'.$controller->getChildrenUrlTimeline(2))); @@ -358,11 +358,11 @@ class MenuBar $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}"); $menu->addSubmenu($submenu); break; - + } } } - + break; case "lifespan": @@ -469,7 +469,7 @@ class MenuBar */ static function getListsMenu($surname="") { global $TEXT_DIRECTION, $WT_IMAGES, $MULTI_MEDIA, $SEARCH_SPIDER, $controller; - + $style = "top"; if ($surname) $style = "sub"; if (isset($controller)) { @@ -483,7 +483,7 @@ class MenuBar } } } - + if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; if (!empty($SEARCH_SPIDER)) { // Only want the indi list for search engines. @@ -670,8 +670,8 @@ class MenuBar if (isset($controller->famid)) $famid = $controller->famid; } } - - + + if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff=""; if ((!file_exists(WT_ROOT.'reportengine.php')) || (!empty($SEARCH_SPIDER))) { $menu = new Menu("", "", ""); @@ -878,7 +878,7 @@ class MenuBar $current=get_user_setting(WT_USER_ID, 'theme'); $all_themes=get_theme_names(); if (!array_key_exists($current, $all_themes)) { - $current=$THEME_DIR; + $current=$THEME_DIR; } if ($ALLOW_THEME_DROPDOWN && !$SEARCH_SPIDER && get_site_setting('ALLOW_USER_THEMES')) { diff --git a/includes/classes/class_reportbase.php b/includes/classes/class_reportbase.php index 2722a4d7f0..22ed709636 100644 --- a/includes/classes/class_reportbase.php +++ b/includes/classes/class_reportbase.php @@ -117,7 +117,7 @@ class ReportBase { * @var string */ public $pageFormat = "A4"; - + /** * Height of page format in points * @see DocSHandler() @@ -157,27 +157,27 @@ class ReportBase { * @var string */ public $processing = "H"; - + /** * RTL Language (false=LTR, true=RTL) * @see ReportBase::setup() * @var boolean */ public $rtl = false; - + /** * User measure unit. * @var string const */ const unit = "pt"; - + /** * Character set * @see ReportBase::setup() * @var string */ public $charset = "UTF-8"; - + /** * Show the Generated by... (true=show the text) * @see DocSHandler() @@ -190,7 +190,7 @@ class ReportBase { * @var string */ public $generatedby = ""; - + /** * webtrees URL * @var string const @@ -255,15 +255,15 @@ class ReportBase { /** * The current ISO 216 standard was introduced in 1975 and is a direct follow up to the german DIN 476 standard from 1922. ISO 216 is also called EN 20216 in Europe. * The ISO paper sizes are based on the metric system so everything else is aproxiamte - * + * * The Series A is used for Standard Printing and Stationary. * The Series B is used for Posters, Wall-Charts etc. * The C series is used for folders, post cards and envelopes. C series envelope is suitable to insert A series sizes. * ISO also define format series RA and SRA for untrimmed raw paper, where SRA stands for 'supplementary raw format A'. * Japan has adopted the ISO series A sizes, but its series B sizes are slightly different. These sizes are sometimes called JIS B or JB sizes. * sun was a unit of length used in Japan and is equal to about 3.03 cm or 1.193 inches - * The United States, Canada, and in part Mexico, are today the only industrialized nations in which the ISO standard paper sizes are not yet widely used. - * + * The United States, Canada, and in part Mexico, are today the only industrialized nations in which the ISO standard paper sizes are not yet widely used. + * * A0 & A1 Technical drawings, posters * A1 & A2 Flip charts * A2 & A3 Drawings, diagrams, large tables @@ -448,7 +448,7 @@ class ReportBase { } /** - * @deprecated + * @deprecated * @todo Is this a deprecated function or a future feature? * function get_type() { @@ -546,7 +546,7 @@ class Element { $this->text = $text; return 0; } - + } //-- END Element /** @@ -618,7 +618,7 @@ class Cell extends Element { */ public $bocolor; /** - * The HTML color code to fill the background of this cell. + * The HTML color code to fill the background of this cell. * @var string */ public $bgcolor; @@ -645,7 +645,7 @@ class Cell extends Element { */ public $newline; /** - * The name of the Style that should be used to render the text. + * The name of the Style that should be used to render the text. * @var string */ public $styleName; @@ -671,11 +671,11 @@ class Cell extends Element { public $url; /** * Cell width DEFAULT 0 (expressed in points) - * Setting the width to 0 will make it the width from the current location to the right margin. + * Setting the width to 0 will make it the width from the current location to the right margin. * @var int */ public $width; - + public $reseth; /** @@ -760,7 +760,7 @@ class TextBox extends Element { * @var array */ public $elements = array(); - + /** * Background color in HTML code * @var string @@ -771,7 +771,7 @@ class TextBox extends Element { * @var boolean */ public $fill; - + /** * Position the left corner of this box on the page(expressed in points). The default is the current position. * @var mix @@ -787,12 +787,12 @@ class TextBox extends Element { * @var boolean */ public $newline; - + /** * @var boolean */ public $pagecheck; - + /** * Whether or not a border should be printed around this box. 0 = no border, 1 = border. Default is 0 * @var boolean @@ -811,7 +811,7 @@ class TextBox extends Element { * @var string */ public $style; - + /** * @var array $borderstyle Border style of rectangle. Array with keys among the following: * <ul> @@ -841,7 +841,7 @@ class TextBox extends Element { * Resets this box last height after it's done */ public $reseth; - + /** * TextBox - Element - Base * @@ -1137,7 +1137,7 @@ class Image extends Element { * @var string */ public $line = ""; - + /** * Image class function - Base * @@ -1147,7 +1147,7 @@ class Image extends Element { * @param float $w Width of the image * @param float $h Height of the image * @param string $align Placement of the image. L: left, C:center, R:right - * @param string $ln T:same line, N:next line + * @param string $ln T:same line, N:next line */ function Image($file, $x, $y, $w, $h, $align, $ln) { $this->file = $file; @@ -1751,7 +1751,7 @@ function CellSHandler($attrs) { // int Cell height (expressed in points) The starting height of this cell. If the text wraps the height will automatically be adjusted. $height= 0; if (!empty($attrs["height"])) $height = (int)$attrs["height"]; - // int Cell width (expressed in points) Setting the width to 0 will make it the width from the current location to the right margin. + // int Cell width (expressed in points) Setting the width to 0 will make it the width from the current location to the right margin. $width = 0; if (!empty($attrs["width"])) $width = (int)$attrs["width"]; @@ -1782,7 +1782,7 @@ function CellSHandler($attrs) { } } - // string The name of the Style that should be used to render the text. + // string The name of the Style that should be used to render the text. $style = ""; if (!empty($attrs["style"])) $style = $attrs["style"]; @@ -1967,7 +1967,7 @@ function TextBoxSHandler($attrs) { // string Background color code $bgcolor = ""; if (!empty($attrs["bgcolor"])) $bgcolor = $attrs["bgcolor"]; - + // boolean Wether or not fill the background color $fill = true; if (isset($attrs["fill"])) { @@ -1999,14 +1999,14 @@ function TextBoxSHandler($attrs) { $borderstyle = ""; if (!empty($attrs["borderstyle"])) $borderstyle = $attrs["borderstyle"]; */ - + // int The starting height of this cell. If the text wraps the height will automatically be adjusted $height = 0; if (!empty($attrs["height"])) $height = (int)$attrs["height"]; // int Setting the width to 0 will make it the width from the current location to the margin $width = 0; if (!empty($attrs["width"])) $width = (int)$attrs["width"]; - + // mixed Position the left corner of this box on the page. The default is the current position. $left = "."; if (isset($attrs["left"])) { @@ -2104,7 +2104,7 @@ function TextSHandler($attrs) { array_push($printDataStack, $printData); $printData = true; - // string The name of the Style that should be used to render the text. + // string The name of the Style that should be used to render the text. $style = ""; if (!empty($attrs["style"])) $style = $attrs["style"]; @@ -2130,13 +2130,13 @@ function TextEHandler() { * Get the name * 1. id is empty - current GEDCOM record * 2. id is set with a record id -* +* * @param array $attrs an array of key value pairs for the attributes */ function GetPersonNameSHandler($attrs) { // @deprecated global $currentElement, $vars, $gedrec; - + $id = ""; $match = array(); if (empty($attrs["id"])) { @@ -2209,7 +2209,7 @@ function GetPersonNameSHandler($attrs) { /** * XML <GedcomValue> start elemnt handler -* +* * @param array $attrs an array of key value pairs for the attributes */ function GedcomValueSHandler($attrs) { @@ -2221,7 +2221,7 @@ function GedcomValueSHandler($attrs) { if (preg_match("/0 @(.+)@/", $gedrec, $match)) { $id = $match[1]; } - + if (isset($attrs["newline"]) && $attrs["newline"]=="1") { $useBreak = "1"; } else { @@ -2271,7 +2271,7 @@ function GedcomValueSHandler($attrs) { /** * XML <RepeatTag> start elemnt handler -* +* * @see RepeatTagEHandler() * @param array $attrs an array of key value pairs for the attributes */ @@ -2346,7 +2346,7 @@ function RepeatTagSHandler($attrs) { /** * XML </ RepeatTag> end elemnt handler -* +* * @see RepeatTagSHandler() */ function RepeatTagEHandler() { @@ -2429,20 +2429,20 @@ function RepeatTagEHandler() { /** * Variable lookup -* +* * Retrieve predefined variables : * @ desc GEDCOM fact description, example: * 1 EVEN This is a description * @ fact GEDCOM fact tag, such as BIRT, DEAT etc. * $ i18n::translate('....') * $ language_settings[] -* -* +* +* * Or retrieve variables preset with <SetVar> element -* +* * If the variable is a date and 'date="1"' attribute is set then the date will be reformated * from Sep to September -* +* * @param array $attrs an array of key value pairs for the attributes * @see SetVarSHandler() */ @@ -2455,7 +2455,7 @@ function varSHandler($attrs) { if (empty($attrs["var"])) { die("<strong>REPORT ERROR var: </strong> The attribute \"var=\" is missing or not set in the XML file on line: ".xml_get_current_line_number($parser)); } - + $var = $attrs["var"]; // SetVar element preset variables if (!empty($vars[$var]["id"])) { @@ -2484,7 +2484,7 @@ function varSHandler($attrs) { /** * Variable lookup, retrieve the first letter only -* +* * @param array $attrs an array of key value pairs for the attributes */ function varLetterSHandler($attrs) { @@ -2587,7 +2587,7 @@ function FactsSHandler($attrs) { /** * XML </ Facts> end elemnt handler -* +* * @see FactsSHandler() */ function FactsEHandler() { @@ -2681,7 +2681,7 @@ function SetVarSHandler($attrs) { if (empty($attrs["name"])) { die("<strong>REPORT ERROR var: </strong> The attribute \"name=\" is missing or not set in the XML file"); } - + $name = $attrs["name"]; $value = $attrs["value"]; $match = array(); @@ -2778,7 +2778,7 @@ function ifSHandler($attrs) { } elseif ($id=="generation") { $value = "\"$generation\""; } else { - + $temp = explode(" ", trim($gedrec)); $level = $temp[0]; if ($level==0) { @@ -2814,7 +2814,7 @@ function ifEHandler() { * XML <Footnote > start element * Collect the Footnote links * GEDCOM Records that are protected by Privacy setting will be ignore -* +* * @param array $attrs an array of key value pairs for the attributes * @see FootnoteEHandler() */ @@ -2846,7 +2846,7 @@ function FootnoteSHandler($attrs) { /** * XML <Footnote /> end element * Print the collected Footnote data -* +* * @see FootnoteSHandler() */ function FootnoteEHandler() { @@ -3012,10 +3012,10 @@ function ImageSHandler($attrs) { $height = 0; if (!empty($attrs["width"])) $width = (int)$attrs["width"]; if (!empty($attrs["height"])) $height = (int)$attrs["height"]; - + $file = ""; if (!empty($attrs["file"])) $file = $attrs["file"]; - + if ($file=="@FILE") { $match = array(); if (preg_match("/\d OBJE @(.+)@/", $gedrec, $match)) { @@ -3548,7 +3548,7 @@ function ListEHandler() { /** * XML <ListTotal> elemnt handler -* +* * Prints the total number of records in a list * The total number is collected from * List and Relatives @@ -3705,7 +3705,7 @@ function RelativesSHandler($attrs) { /** * XML </ Relatives> end elemnt handler -* +* * @see RelativesSHandler() */ function RelativesEHandler() { @@ -3773,7 +3773,7 @@ function RelativesEHandler() { xml_set_element_handler($repeat_parser, "startElement", "endElement"); //-- set the character data handler xml_set_character_data_handler($repeat_parser, "characterData"); - + if (!xml_parse($repeat_parser, $reportxml, true)) { printf($reportxml."\nRelativesEHandler XML error: %s at line %d", xml_error_string(xml_get_error_code($repeat_parser)), xml_get_current_line_number($repeat_parser)); print_r($repeatsStack); @@ -3794,7 +3794,7 @@ function RelativesEHandler() { /** * XML <Generation /> elemnt handler -* +* * Prints the number of generations * @todo no info on wiki * @see Element::addText() diff --git a/includes/classes/class_reporthtml.php b/includes/classes/class_reporthtml.php index 9fa0810b83..f173edb0e6 100644 --- a/includes/classes/class_reporthtml.php +++ b/includes/classes/class_reporthtml.php @@ -1318,7 +1318,7 @@ class FootnoteHTML extends Footnote { * @param ReportBaseHTML &$html */ function renderFootnote(&$html) { - + if ($html->getCurrentStyle() != $this->styleName) { $html->setCurrentStyle($this->styleName); } @@ -1355,7 +1355,7 @@ class FootnoteHTML extends Footnote { /** * Get the width of text * Breaks up a text into lines if needed - * + * * @param ReportBaseHTML &$html * @return array */ diff --git a/includes/classes/class_reportpdf.php b/includes/classes/class_reportpdf.php index c7586488f2..ef1746e923 100644 --- a/includes/classes/class_reportpdf.php +++ b/includes/classes/class_reportpdf.php @@ -239,7 +239,7 @@ class ReportBasePDF extends ReportBase { * @param int $w Image width * @param int $h Image height * @param string $align L:left, C:center, R:right or empty to use x/y - * @param string $ln T:same line, N:next line + * @param string $ln T:same line, N:next line * @return ImagePDF */ function createImage($file, $x, $y, $w, $h, $align, $ln) { @@ -320,7 +320,7 @@ class PDF extends TCPDF { * @var int */ public $lastpicpage = 0; - + public $wt_report; /** @@ -518,7 +518,7 @@ class PDF extends TCPDF { $this->SetX($x); return $x; } - + /** * Get the maximum line width to draw from the curren position -PDF * RTL supported @@ -532,7 +532,7 @@ class PDF extends TCPDF { return ($this->getRemainingWidth() + $m["left"]); } } - + function getFootnotesHeight() { $h=0; foreach($this->printedfootnotes as $element) { @@ -578,7 +578,7 @@ class PDF extends TCPDF { $this->printedfootnotes[] = $footnote; return false; } - + /** * Used this function instead of AddPage() * This function will make sure that images will not be overwritten @@ -590,11 +590,11 @@ class PDF extends TCPDF { $this->AddPage(); } - + /******************************************* * TCPDF protected functions *******************************************/ - + /** * Add a page if needed -PDF * @param $height Cell height. Default value: 0 @@ -611,7 +611,7 @@ class PDF extends TCPDF { function getRemainingWidthPDF() { return $this->getRemainingWidth(); } - + } //-- END PDF /** @@ -662,7 +662,7 @@ class CellPDF extends Cell { * This is the bugfree version */ $cX = 0; // Class Left - + // Set up the text style if (($pdf->getCurrentStyle()) != ($this->styleName)) { $pdf->setCurrentStyle($this->styleName); @@ -1085,7 +1085,7 @@ class TextBoxPDF extends TextBox { } // Save the current page number $cPN = $pdf->getPage(); - + // Render the elements (write text, print picture...) foreach($this->elements as $element) { if (is_object($element)) { @@ -1180,7 +1180,7 @@ class TextPDF extends Text { /** * Splits the text into lines if necessary to fit into a giving cell - * + * * @param PDF &$pdf * @return array */ @@ -1329,7 +1329,7 @@ class FootnotePDF extends Footnote { /** * Splits the text into lines to fit into a giving cell * and returns the last lines width - * + * * @param PDF &$pdf * @return array */ @@ -1483,7 +1483,7 @@ class ImagePDF extends Image { } else { $pdf->SetY($this->y); } - + $pdf->Image($this->file, $this->x, $this->y, $this->width, $this->height, "", "", $this->line, false, 72, $this->align); $lastpicpage = $pdf->PageNo(); $pdf->lastpicpage = $pdf->getPage(); diff --git a/includes/classes/class_treenav.php b/includes/classes/class_treenav.php index 36e077ce63..47cbf64d4f 100644 --- a/includes/classes/class_treenav.php +++ b/includes/classes/class_treenav.php @@ -287,7 +287,7 @@ class TreeNav { ?> <span class="name1"> - <?php $thumb = $this->getThumbnail($person); + <?php $thumb = $this->getThumbnail($person); if (!empty($thumb)) { echo $thumb; } else if ($USE_SILHOUETTE && isset($WT_IMAGES["default_image_U"])) { @@ -303,7 +303,7 @@ class TreeNav { } else { $thumbnail .= $WT_IMAGES["default_image_U"]; - } + } $thumbnail .="\" class=\"".$class."\" border=\"none\" alt=\"\" />"; echo $thumbnail; } ?> @@ -325,7 +325,7 @@ class TreeNav { if (!empty($spouse)) { $name = $spouse->getFullName(); ?> - <?php $thumb = $this->getThumbnail($spouse); + <?php $thumb = $this->getThumbnail($spouse); if (!empty($thumb)) { echo $thumb; } else if ($USE_SILHOUETTE && isset($WT_IMAGES["default_image_U"])) { @@ -341,7 +341,7 @@ class TreeNav { } else { $thumbnail .= $WT_IMAGES["default_image_U"]; - } + } $thumbnail .="\" class=\"".$class."\" border=\"none\" alt=\"\" />"; echo $thumbnail; } ?> diff --git a/includes/classes/class_wt_db.php b/includes/classes/class_wt_db.php index 62531330ce..53cdadd737 100644 --- a/includes/classes/class_wt_db.php +++ b/includes/classes/class_wt_db.php @@ -53,7 +53,7 @@ class WT_DB { public final function __clone() { trigger_error('WT_DB::clone() is not allowed.', E_USER_ERROR); } - + // Prevent instantiation via serialize() public final function __wakeup() { trigger_error('WT_DB::unserialize() is not allowed.', E_USER_ERROR); @@ -262,7 +262,7 @@ class WT_DB { } return new WT_DBStatement(self::$pdo->prepare($statement)); } - + // Map all other functions onto the base PDO object public function __call($function, $params) { return call_user_func_array(array(self::$pdo, $function), $params); diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php index 69a07bdd11..ea3e64a84d 100644 --- a/includes/controllers/individual_ctrl.php +++ b/includes/controllers/individual_ctrl.php @@ -92,7 +92,7 @@ class IndividualController extends BaseController { // Start with the gedcom's default tab $this->default_tab=get_gedcom_setting(WT_GED_ID, 'GEDCOM_DEFAULT_TAB'); } - + if (find_person_record($this->pid, WT_GED_ID) || find_updated_record($this->pid, WT_GED_ID)!==null){ $this->indi = new Person($gedrec, false); $this->indi->ged_id=WT_GED_ID; // This record is from a file @@ -199,19 +199,19 @@ class IndividualController extends BaseController { $this->tabs = WT_Module::getActiveTabs(); foreach($this->tabs as $mod) { $mod->setController($this); - if ($mod->hasTabContent()) { + if ($mod->hasTabContent()) { if (empty($this->default_tab)) { $this->default_tab=$mod->getName(); } } } - + if (!isset($_SESSION['WT_pin']) && $DEFAULT_PIN_STATE) $_SESSION['WT_pin'] = true; - + if (!isset($_SESSION['WT_sb_closed']) && $DEFAULT_SB_CLOSED_STATE) $_SESSION['WT_sb_closed'] = true; - + //-- handle ajax calls if ($this->action=="ajax") { $tab = 0; @@ -229,17 +229,17 @@ class IndividualController extends BaseController { echo WT_JS_END; } } - + if (isset($_REQUEST['pin'])) { if ($_REQUEST['pin']=='true') $_SESSION['WT_pin'] = true; else $_SESSION['WT_pin'] = false; } - + if (isset($_REQUEST['sb_closed'])) { if ($_REQUEST['sb_closed']=='true') $_SESSION['WT_sb_closed'] = true; else $_SESSION['WT_sb_closed'] = false; } - + //-- only get the requested tab and then exit if (WT_DEBUG_SQL) { echo WT_DB::getQueryLog(); @@ -340,7 +340,7 @@ class IndividualController extends BaseController { $result .= $WT_IMAGES["default_image_M"]; } else { $result .= $WT_IMAGES["default_image_U"]; - } + } $result .="\" class=\"".$class."\" border=\"none\" alt=\"\" />"; return $result; } @@ -637,7 +637,7 @@ class IndividualController extends BaseController { $otherfacts = $this->indi->getOtherFacts(); return $otherfacts; } - + /** * get the person box stylesheet class * for the given person @@ -659,7 +659,7 @@ class IndividualController extends BaseController { } return "person_box".$isf; } - + /** * build an array of Person that will be used to build a list * of family members on the close relatives tab diff --git a/includes/controllers/media_ctrl.php b/includes/controllers/media_ctrl.php index 35a016365a..e3efe0c9b4 100644 --- a/includes/controllers/media_ctrl.php +++ b/includes/controllers/media_ctrl.php @@ -182,7 +182,7 @@ class MediaController extends BaseController{ $menu = new Menu(i18n::translate('Edit')); $menu->addIcon('edit_media'); $menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}", 'icon_large_gedcom'); - + if (WT_USER_CAN_EDIT) { $submenu = new Menu(i18n::translate('Edit media')); $submenu->addOnclick("window.open('addmedia.php?action=editmedia&pid={$this->pid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')"); @@ -193,10 +193,10 @@ class MediaController extends BaseController{ // main link displayed on page if (WT_USER_GEDCOM_ADMIN && file_exists(WT_ROOT.'modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) { $submenu = new Menu(i18n::translate('Manage links')); - } else { + } else { $submenu = new Menu(i18n::translate('Set link')); } - + // GEDFact assistant Add Media Links ======================= if (WT_USER_GEDCOM_ADMIN && file_exists(WT_ROOT.'modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) { $submenu->addOnclick("return ilinkitem('".$this->pid."','manage');"); diff --git a/includes/controllers/note_ctrl.php b/includes/controllers/note_ctrl.php index 350ceb6458..2d86118df9 100644 --- a/includes/controllers/note_ctrl.php +++ b/includes/controllers/note_ctrl.php @@ -172,7 +172,7 @@ class NoteController extends BaseController { $submenu->addIcon('edit_note'); $submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}"); $menu->addSubmenu($submenu); - + $menu->addSeparator(); } diff --git a/includes/controllers/pedigree_ctrl.php b/includes/controllers/pedigree_ctrl.php index bb826d4009..740282040a 100644 --- a/includes/controllers/pedigree_ctrl.php +++ b/includes/controllers/pedigree_ctrl.php @@ -209,7 +209,7 @@ class PedigreeController extends BaseController { if ($i%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * $temp); else $this->yoffset=$this->yoffset + (($boxspacing/2) * $temp); } - + } $this->yoffset-=(($boxspacing/2)*pow(2,($this->PEDIGREE_GENERATIONS-2))-($boxspacing/2)); } @@ -217,7 +217,7 @@ class PedigreeController extends BaseController { $this->xoffset = 10 + $basexoffset + (($this->PEDIGREE_GENERATIONS - $this->curgen) * ($this->pbwidth+$bxspacing)); if ($this->curgen == $this->PEDIGREE_GENERATIONS) $this->xoffset += 10; if ($this->PEDIGREE_GENERATIONS<4) $this->xoffset += 60; - } + } else if ($this->talloffset==2) { if ($this->show_full) $this->xoffset = ($this->curgen) * (($this->pbwidth+$bxspacing) / 2)+($this->curgen)*10+136.5; else $this->xoffset = ($this->curgen) * (($this->pbwidth+$bxspacing) / 4)+($this->curgen)*10+215.75; diff --git a/includes/controllers/remotelink_ctrl.php b/includes/controllers/remotelink_ctrl.php index db002adfbd..3111e8933b 100644 --- a/includes/controllers/remotelink_ctrl.php +++ b/includes/controllers/remotelink_ctrl.php @@ -87,7 +87,7 @@ class RemoteLinkController extends BaseController { $this->form_txtPassword =safe_POST('txtPassword', WT_REGEX_PASSWORD); $this->form_cbExistingServers=safe_POST('cbExistingServers', array_keys($this->server_list)); $this->form_txtCB_Title =safe_POST('txtCB_Title', '[^<>"%{};]+'); - $this->form_txtCB_GID =safe_POST('txtCB_GID', $this->gedcom_list); + $this->form_txtCB_GID =safe_POST('txtCB_GID', $this->gedcom_list); $this->form_txtFS_URL =safe_POST('txtFS_URL', WT_REGEX_URL); $this->form_txtFS_Title =safe_POST('txtFS_Title', '[^<>"%{};]+'); $this->form_txtFS_GID =safe_POST('txtFS_GID', $this->gedcom_list); @@ -96,7 +96,7 @@ class RemoteLinkController extends BaseController { if (is_null($this->form_location)) { if ($this->server_list) { - $this->form_location='existing'; + $this->form_location='existing'; } else { $this->form_location='remote'; } @@ -126,7 +126,7 @@ class RemoteLinkController extends BaseController { if (!$url || !$gedcom_id || !$username || !$password) { return null; } - + if (preg_match('/\?wsdl$/', $url)==0) { $url.="?wsdl"; } @@ -275,16 +275,16 @@ class RemoteLinkController extends BaseController { $relation_type=$this->form_cbRelationship; if ($serverID && $link_pid) { $indirec=find_gedcom_record($this->pid, WT_GED_ID, true); - + switch ($relation_type) { case "father": $indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}"; $stub_id=append_gedrec($indistub, WT_GED_ID); $indistub=find_gedcom_record($stub_id, WT_GED_ID, true); - + $gedcom_fam="0 @new@ FAM\n1 HUSB @{$stub_id}@\n1 CHIL @{$this->pid}@"; $fam_id=append_gedrec($gedcom_fam, WT_GED_ID); - + $indirec.= "\n1 FAMC @{$fam_id}@"; replace_gedrec($this->pid, WT_GED_ID, $indirec); @@ -297,13 +297,13 @@ class RemoteLinkController extends BaseController { $indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}"; $stub_id=append_gedrec($indistub, WT_GED_ID); $indistub=find_gedcom_record($stub_id, WT_GED_ID, true); - + $gedcom_fam="0 @new@ FAM\n1 WIFE @{$stub_id}@\n1 CHIL @{$this->pid}@"; $fam_id=append_gedrec($gedcom_fam, WT_GED_ID); - + $indirec.="\n1 FAMC @{$fam_id}@"; replace_gedrec($this->pid, WT_GED_ID, $indirec); - + $serviceClient=ServiceClient::getInstance($serverID); $indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true); $indistub.="\n1 FAMS @".$fam_id."@"; @@ -313,13 +313,13 @@ class RemoteLinkController extends BaseController { $indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}"; $stub_id=append_gedrec($indistub, WT_GED_ID); $indistub=find_gedcom_record($stub_id, WT_GED_ID, true); - + $gedcom_fam="0 @new@ FAM\n1 MARR Y\n1 WIFE @{$this->pid}@\n1 HUSB @{$stub_id}@\n"; $fam_id=append_gedrec($gedcom_fam, WT_GED_ID); - + $indirec.="\n1 FAMS @{$fam_id}@"; replace_gedrec($this->pid, WT_GED_ID, $indirec); - + $serviceClient=ServiceClient::getInstance($serverID); $indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true); $indistub.="\n1 FAMS @{$fam_id}@"; @@ -332,10 +332,10 @@ class RemoteLinkController extends BaseController { $gedcom_fam="0 @new@ FAM\n1 MARR Y\n1 WIFE @{$stub_id}@\n1 HUSB @{$this->pid}@"; $fam_id=append_gedrec($gedcom_fam, WT_GED_ID); - + $indirec.="\n1 FAMS @{$fam_id}@"; replace_gedrec($this->pid, WT_GED_ID, $indirec); - + $serviceClient=ServiceClient::getInstance($serverID); $indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true); $indistub.="\n1 FAMS @{$fam_id}@\n"; @@ -346,7 +346,7 @@ class RemoteLinkController extends BaseController { $indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}"; $stub_id=append_gedrec($indistub, WT_GED_ID); $indistub=find_gedcom_record($stub_id, WT_GED_ID, true); - + if (get_gedcom_value('SEX', 1, $indirec, '', false)=='F') { $gedcom_fam="0 @new@ FAM\n1 WIFE @{$this->pid}@\n1 CHIL @{$stub_id}@"; } else { @@ -355,7 +355,7 @@ class RemoteLinkController extends BaseController { $fam_id=append_gedrec($gedcom_fam, WT_GED_ID); $indirec.="\n1 FAMS @{$fam_id}@"; replace_gedrec($this->pid, WT_GED_ID, $indirec); - + $serviceClient=ServiceClient::getInstance($serverID); $indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true); $indistub.="\n1 FAMC @".$fam_id."@"; @@ -363,7 +363,7 @@ class RemoteLinkController extends BaseController { break; case 'current_person': $indirec.="\n1 RFN {$serverID}:{$link_pid}\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}"; - + $serviceClient = ServiceClient::getInstance($serverID); if (!is_null($serviceClient)) { //-- get rid of change date diff --git a/includes/extras/functions.pl.php b/includes/extras/functions.pl.php index 89f9db3853..bfa1170671 100644 --- a/includes/extras/functions.pl.php +++ b/includes/extras/functions.pl.php @@ -43,7 +43,7 @@ function getFirstRelationsName_pl($pid) { $fname=''; } //return $fname; - + // tested $pname=''; $sex = Person::getInstance($pid)->getSex(); diff --git a/includes/functions/functions.php b/includes/functions/functions.php index 93922b45f4..122403808e 100644 --- a/includes/functions/functions.php +++ b/includes/functions/functions.php @@ -1769,7 +1769,7 @@ function get_relationship($pid1, $pid2, $followspouse=true, $maxlength=0, $ignor //echo execution_stats(); //echo "-->\n"; } - + // Convert "generic" relationships into sex-specific ones. foreach ($resnode['path'] as $n=>$pid) { switch ($resnode['relations'][$n]) { @@ -1911,7 +1911,7 @@ function get_relationship_name_from_path($path, $pid1, $pid2) { switch ($path) { case '': return i18n::translate('self'); - + // Level One relationships case 'mot': return i18n::translate('mother'); case 'fat': return i18n::translate('father'); @@ -1967,7 +1967,7 @@ function get_relationship_name_from_path($path, $pid1, $pid2) { } } return i18n::translate('sibling'); - + // Level Two relationships case 'brochi': return i18n::translate_c('brother\'s child', 'nephew/niece'); case 'brodau': return i18n::translate_c('brother\'s daughter', 'niece'); @@ -2762,7 +2762,7 @@ function get_relationship_name_from_path($path, $pid1, $pid2) { case 'es': // Source: Wes Groleau (adding doesn't change behavior, but needs to be better researched) default: switch ($last) { - + case 'son': // I18N: if you need a different number for %d, contact the developers, as a code-change is required return i18n::translate('great x%d grandson', $up-2); case 'dau': return i18n::translate('great x%d granddaughter', $up-2); @@ -3359,8 +3359,8 @@ function mediaFileInfo($fileName, $thumbName, $mid, $name='', $notes='', $obeyVi } else if (preg_match('/\.wmv$/i', $fileName)) { $type .= 'wmv'; } else if (strpos($fileName, 'http://maps.google.')===0) { - $type .= 'streetview'; - } else { + $type .= 'streetview'; + } else { $type .= 'other'; } // $type is now: (url | local) _ (flv | picasa | image | page | audio | wmv | streetview |other) @@ -3397,7 +3397,7 @@ function mediaFileInfo($fileName, $thumbName, $mid, $name='', $notes='', $obeyVi $url = encode_url($fileName) . "\" rel='clearbox({$LB_URL_WIDTH}, {$LB_URL_HEIGHT}, click)' rev=\"" . $mid . "::" . $GEDCOM . "::" . PrintReady(htmlspecialchars($name, ENT_COMPAT, 'UTF-8')) . "::" . htmlspecialchars($notes, ENT_COMPAT, 'UTF-8'); break 2; case 'url_streetview': - if (WT_SCRIPT_NAME != "media.php") { + if (WT_SCRIPT_NAME != "media.php") { echo '<iframe style="float:left; padding:5px;" width="264" height="176" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'. $fileName. '&output=svembed"></iframe>'; } break 2; diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php index 23f3b8f2e2..dff42ccd3a 100644 --- a/includes/functions/functions_charts.php +++ b/includes/functions/functions_charts.php @@ -518,7 +518,7 @@ function print_family_facts(&$family, $sosa = 0) { // -- new fact link if ($sosa==0 && WT_USER_CAN_EDIT) { print_add_new_fact($famid, $indifacts, "FAM"); - + // -- new note print "<tr><td class=\"descriptionbox\">"; print i18n::translate('Add Note'); @@ -527,7 +527,7 @@ function print_family_facts(&$family, $sosa = 0) { print "<a href=\"javascript:;\" onclick=\"return add_new_record('$famid','NOTE');\">" . i18n::translate('Add a new note') . "</a>"; print "<br />\n"; print "</td></tr>\n"; - + // -- new shared note print "<tr><td class=\"descriptionbox\">"; print i18n::translate('Add Shared Note'); @@ -536,7 +536,7 @@ function print_family_facts(&$family, $sosa = 0) { print "<a href=\"javascript:;\" onclick=\"return add_new_record('$famid','SHARED_NOTE');\">" . i18n::translate('Add a new shared note') . "</a>"; print "<br />\n"; print "</td></tr>\n"; - + // -- new media print "<tr><td class=\"descriptionbox\">"; print i18n::translate('Add media'); @@ -546,7 +546,7 @@ function print_family_facts(&$family, $sosa = 0) { print "<br />\n"; print "<a href=\"javascript:;\" onclick=\"window.open('inverselink.php?linktoid={$famid}&linkto=family', '_blank', 'top=50,left=50,width=400,height=300,resizable=1,scrollbars=1'); return false;\">".i18n::translate('Link to an existing Media item')."</a>"; print "</td></tr>\n"; - + // -- new source citation print "<tr><td class=\"descriptionbox\">"; print i18n::translate('Add Source Citation'); diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php index 97caabd5f1..fd2fd2f6f9 100644 --- a/includes/functions/functions_db.php +++ b/includes/functions/functions_db.php @@ -837,7 +837,7 @@ function find_gedcom_record($xref, $ged_id, $pending=false) { } else { $gedcom=null; } - + if (is_null($gedcom)) { $gedcom=find_person_record($xref, $ged_id); } @@ -1262,7 +1262,7 @@ function search_indis_dates($day, $month, $year, $facts) { function search_indis_daterange($start, $end, $facts) { $sql="SELECT 'INDI' AS type, i_id AS xref, i_file AS ged_id, i_gedcom AS gedrec, i_isdead, i_sex FROM `##individuals` JOIN `##dates` ON i_id=d_gid AND i_file=d_file WHERE i_file=? AND d_julianday1 BETWEEN ? AND ?"; $vars=array(WT_GED_ID, $start, $end); - + if ($facts) { $facts=explode(',', $facts); foreach ($facts as $key=>$value) { @@ -1472,7 +1472,7 @@ function search_notes($query, $geds, $match, $skip) { $querysql=array(); // Convert the query into a regular expression $queryregex=array(); - + foreach ($query as $q) { $queryregex[]=preg_quote(utf8_strtoupper($q), '/'); $querysql[]="o_gedcom LIKE ".WT_DB::quote("%{$q}%")." COLLATE '".i18n::$collation."'"; diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php index 8e980359a3..9b4daf5511 100644 --- a/includes/functions/functions_edit.php +++ b/includes/functions/functions_edit.php @@ -506,7 +506,7 @@ function print_indi_form($nextaction, $famid, $linenum='', $namerec='', $famtag= global $bdm, $TEXT_DIRECTION, $STANDARD_NAME_FACTS, $REVERSED_NAME_FACTS, $ADVANCED_NAME_FACTS, $ADVANCED_PLAC_FACTS; global $QUICK_REQUIRED_FACTS, $QUICK_REQUIRED_FAMFACTS, $NO_UPDATE_CHAN; - $SURNAME_TRADITION=get_gedcom_setting(WT_GED_ID, 'SURNAME_TRADITION'); + $SURNAME_TRADITION=get_gedcom_setting(WT_GED_ID, 'SURNAME_TRADITION'); $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR init_calendar_popup(); @@ -1041,7 +1041,7 @@ function print_calendar_popup($id, $asString=false) { */ function print_addnewmedia_link($element_id) { global $WT_IMAGES, $pid; - + $text = i18n::translate('Add a new media item'); if (isset($WT_IMAGES["button_addmedia"])) $Link = "<img src=\"".$WT_IMAGES["button_addmedia"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; @@ -1068,7 +1068,7 @@ function print_addnewrepository_link($element_id) { */ function print_addnewnote_link($element_id) { global $WT_IMAGES, $pid; - + $text = i18n::translate('Create a new Shared Note'); if (isset($WT_IMAGES["button_addnote"])) $Link = "<img src=\"".$WT_IMAGES["button_addnote"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; @@ -1313,18 +1313,18 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= echo " style=\"display:none;\""; } echo " >\n"; - + if (in_array($fact, $subnamefacts) || $fact=="LATI" || $fact=="LONG") { echo "<td class=\"optionbox $TEXT_DIRECTION wrap width25\">"; }else{ echo "<td class=\"descriptionbox $TEXT_DIRECTION wrap width25\">"; } - + if (WT_DEBUG) { echo $element_name, "<br />\n"; } - + // tag name if (!empty($label)) { @@ -1338,7 +1338,7 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= echo translate_fact('SHARED_NOTE'); /* if (file_exists(WT_ROOT.'modules/GEDFact_assistant/_CENS/census_1_ctrl.php') && $pid && $label=="GEDFact Assistant") { - // use $label (GEDFact Assistant); + // use $label (GEDFact Assistant); }else{ echo i18n::translate('Shared note'); } @@ -1384,8 +1384,8 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= echo "<input type=\"hidden\" name=\"islink[]\" value=\"", $islink, "\" />\n"; echo "<input type=\"hidden\" name=\"tag[]\" value=\"", $fact, "\" />\n"; - // Shared Notes Debug ------------------------------------------------ - // Please leave until GEDFact assistant/_CENS is released - B.Holland + // Shared Notes Debug ------------------------------------------------ + // Please leave until GEDFact assistant/_CENS is released - B.Holland // echo "<br />Label = ".$label; // echo "<br />Level = ".$level; // echo "<br />Link = ".$islink; @@ -1419,18 +1419,18 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= echo i18n::translate('Yes'); } /* - // If GEDFAct_assistant/_CENS/ module exists && we are on the INDI page && action is ADD a new CENS event + // If GEDFAct_assistant/_CENS/ module exists && we are on the INDI page && action is ADD a new CENS event // Then show the add Shared note input field and the GEDFact assisted icon. - // If GEDFAct_assistant/_CENS/ module not installed ... do not show + // If GEDFAct_assistant/_CENS/ module not installed ... do not show if (file_exists(WT_ROOT.'modules/GEDFact_assistant/_CENS/census_1_ctrl.php') && $pid && $fact=="CENS") { $type_pid=GedcomRecord::getInstance($pid); - if ($type_pid->getType()=="INDI" && $action=="add" ) { + if ($type_pid->getType()=="INDI" && $action=="add" ) { add_simple_tag("2 SHARED_NOTE", "", "GEDFact Assistant"); } } // ----------------------------------------------------------------------------------------------------- */ - + } else if ($fact=="TEMP") { echo "<select tabindex=\"", $tabkey, "\" name=\"", $element_name, "\" >\n"; @@ -1682,12 +1682,12 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= print_editnote_link($value); } // If GEDFact_assistant/_CENS/ module exists && we are on the INDI page and the action is a GEDFact CENS assistant addition. - // Then show the add Shared note assisted icon, if not ... show regular Shared note icons. + // Then show the add Shared note assisted icon, if not ... show regular Shared note icons. if (file_exists(WT_ROOT.'modules/GEDFact_assistant/_CENS/census_1_ctrl.php') && ($action=="add" || $action=="edit" ) && $pid) { // Check if a CENS event --------------------------- if ($event_add=="census_add") { $type_pid=GedcomRecord::getInstance($pid); - if ($type_pid->getType()=="INDI" ) { + if ($type_pid->getType()=="INDI" ) { echo " "; echo " "; echo "<a href=\"javascript:ADD;\" onclick=\"addnewnote_assisted(document.getElementById('", $element_id, "'), '", $pid, "' ); return false;\" title=\"".i18n::translate('Create a new Shared Note using Assistant')."\" alt=\"".i18n::translate('Create a new Shared Note using Assistant')."\">"; @@ -1699,17 +1699,17 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= } } - if ($fact=="OBJE") { + if ($fact=="OBJE") { print_findmedia_link($element_id, "1media"); } if ($fact=="OBJE" && !$value) { print_addnewmedia_link($element_id); $value = "new"; } - + echo "<br />"; } - + // current value if ($TEXT_DIRECTION=="ltr") { if ($fact=="DATE") { @@ -2214,7 +2214,7 @@ function linkMedia($mediaid, $linktoid, $level=1, $chan=true) { if ($level!=1) return false; // Level 2 items get linked elsewhere // find Indi, Family, or Source record to link to $gedrec = find_gedcom_record($linktoid, WT_GED_ID, true); - + //-- check if we are re-editing an unaccepted link that is not already in the DB if (strpos($gedrec, "1 OBJE @$mediaid@")!==false) return false; @@ -2236,7 +2236,7 @@ function linkMedia($mediaid, $linktoid, $level=1, $chan=true) { * @param $linenum should be ALWAYS set to 'OBJE'. * @param int $level Level where the Media Object reference should be removed from (not used) * @param boolean $chan Whether or not to update/add the CHAN record -* +* * @return bool success or failure */ function unlinkMedia($linktoid, $linenum, $mediaid, $level=1, $chan=true) { @@ -2244,7 +2244,7 @@ function unlinkMedia($linktoid, $linenum, $mediaid, $level=1, $chan=true) { if ($level!=1) return false; // Level 2 items get unlinked elsewhere (maybe ??) // find Indi, Family, or Source record to unlink from $gedrec = find_gedcom_record($linktoid, WT_GED_ID, true); - + //-- when deleting/unlinking a media link //-- $linenum comes as an OBJE and the $mediaid to delete should be set if (!is_numeric($linenum)) { @@ -2264,7 +2264,7 @@ function create_add_form($fact) { global $tags, $FULL_SOURCES; $tags = array(); - + // GEDFact_assistant ================================================ if ($fact=="CENS") { global $TEXT_DIRECTION, $CensDate; @@ -2331,14 +2331,14 @@ function create_edit_form($gedrec, $linenum, $level0type) { $type = trim($fields[1]); $level1type = $type; - + // GEDFact_assistant ================================================ if ($type=="CENS") { global $TEXT_DIRECTION, $CensDate; $CensDate="yes"; } // ================================================================== - + if (count($fields)>2) { $ct = preg_match("/@.*@/", $fields[2]); $levellink = $ct > 0; @@ -2366,7 +2366,7 @@ function create_edit_form($gedrec, $linenum, $level0type) { if (preg_match_all('/('.WT_REGEX_TAG.')/', $ADVANCED_PLAC_FACTS, $match)) { $expected_subtags['PLAC']=array_merge($match[1], $expected_subtags['PLAC']); } - + $stack=array(0=>$level0type); // Loop on existing tags : while (true) { diff --git a/includes/functions/functions_mail.php b/includes/functions/functions_mail.php index 5c41f1d8f5..88c863084f 100644 --- a/includes/functions/functions_mail.php +++ b/includes/functions/functions_mail.php @@ -173,7 +173,7 @@ function webtreesMail($to, $from, $subject, $message) { return true; } } elseif ($SMTP_ACTIVE=='internal') { - // use original PHP mail sending function + // use original PHP mail sending function mail($to, hex4email($subject, 'UTF-8'), $message, $extraHeaders); } } diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php index 8420ade832..e73293d2b7 100644 --- a/includes/functions/functions_mediadb.php +++ b/includes/functions/functions_mediadb.php @@ -359,8 +359,8 @@ function get_medialist($currentdir = false, $directory = "", $linkonly = false, } } } -*/ - +*/ + if (!$excludeLinks) { foreach ($medialist as $key=>$media) { foreach (fetch_linked_indi($media["XREF"], 'OBJE', WT_GED_ID) as $indi) { @@ -1346,7 +1346,7 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid = $gedtitl = "TITL"; } add_simple_tag("2 $gedtitl"); - + if (strstr($ADVANCED_NAME_FACTS, "_HEB")!==false) { // 3 _HEB if ($gedrec == "") diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php index 95bb338b6a..3a4fec33b5 100644 --- a/includes/functions/functions_print_facts.php +++ b/includes/functions/functions_print_facts.php @@ -53,7 +53,7 @@ function expand_urls($text) { // This matches far too much while a "precise" regex is several pages long. // This is a compromise. $URL_REGEX='((https?|ftp]):)(//([^\s/?#<>]*))?([^\s?#<>]*)(\?([^\s#<>]*))?(#[^\s?#<>]+)?'; - + return preg_replace_callback( '/'.addcslashes("(?!>)$URL_REGEX(?!</a>)", '/').'/i', create_function( // Insert soft hyphens into the replaced string @@ -79,7 +79,7 @@ function print_fact(&$eventObj, $noedit=false) { if (!$eventObj->canShow()) { return false; } - + $fact = $eventObj->getTag(); $rawEvent = $eventObj->getDetail(); $event = htmlspecialchars($rawEvent, ENT_COMPAT, 'UTF-8'); @@ -168,10 +168,10 @@ function print_fact(&$eventObj, $noedit=false) { echo " <div style=\"width:25px;\">"; $menu->printMenu(); echo "</div>"; - } else { + } else { echo " <ul>"; $menu->printMenu(); - echo "</ul>"; + echo "</ul>"; } } echo "</td>"; @@ -223,7 +223,7 @@ function print_fact(&$eventObj, $noedit=false) { //echo "<td class=\"facts_value facts_value$styleadd\">"; if ((canDisplayFact($pid, WT_GED_ID, $factrec))) { if (isset($resn_value)) { - echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; + echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; echo help_link('RESN'); } // -- first print TYPE for some facts @@ -342,7 +342,7 @@ function print_fact(&$eventObj, $noedit=false) { if ($ct>0) echo " - ", translate_fact('_WT_USER'), ": ", $match[1]; // -- Find RESN tag if (isset($resn_value)) { - echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; + echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; echo help_link('RESN'); } if (preg_match("/\n2 FAMC @(.+)@/", $factrec, $match)) { @@ -907,7 +907,7 @@ function print_main_sources($factrec, $level, $pid, $linenum, $noedit=false) { if ($resn_tag > 0) $resn_value = strtolower(trim($rmatch[1])); // -- Find RESN tag if (isset($resn_value)) { - echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; + echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; echo help_link('RESN'); } $cs = preg_match("/$nlevel EVEN (.*)/", $srec, $cmatch); @@ -988,7 +988,7 @@ function printSourceStructure($textSOUR) { } foreach($textSOUR["TEXT"] as $text) { $data.="<br /> <span class=\"label\">".translate_fact('TEXT').": </span><span class=\"field\">".PrintReady(expand_urls($text))."</span>"; - if (!empty($text) && !empty($note_data)) $data.="<br />"; + if (!empty($text) && !empty($note_data)) $data.="<br />"; $data.=$note_data; } } @@ -1178,10 +1178,10 @@ function print_main_notes($factrec, $level, $pid, $linenum, $noedit=false) { if ( strstr($text, "|") && file_exists(WT_ROOT.'modules/GEDFact_assistant/_CENS/census_note_decode.php') ) { require WT_ROOT.'modules/GEDFact_assistant/_CENS/census_note_decode.php'; }else{ - $text = $centitl."".$text; + $text = $centitl."".$text; } } - + $align = ""; if (!empty($text)) { if ($TEXT_DIRECTION=="rtl" && !hasRTLText($text) && hasLTRText($text)) $align=" align=\"left\""; @@ -1196,7 +1196,7 @@ function print_main_notes($factrec, $level, $pid, $linenum, $noedit=false) { if ($resn_tag > 0) $resn_value = strtolower(trim($rmatch[1])); // -- Find RESN tag if (isset($resn_value)) { - echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; + echo '<img src="images/RESN_', $resn_value, '.gif" alt="', $RESN_CODES[$resn_value], '" title="', $RESN_CODES[$resn_value], '" />'; echo help_link('RESN'); } echo "<br />\n"; diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php index 813ac2cc75..bedc295735 100644 --- a/includes/functions/functions_print_lists.php +++ b/includes/functions/functions_print_lists.php @@ -1321,7 +1321,7 @@ function format_surname_list($surnames, $style, $totals) { $newcol=ceil($count/$col); $html2 ='<table class="list_table"><tr>'; $html2.='<td class="list_value" style="padding: 14px;">'; - + foreach ($html as $surn=>$surns) { $html2.= $surns.'<br />'; $i++; @@ -1331,7 +1331,7 @@ function format_surname_list($surnames, $style, $totals) { } } $html2.='</td></tr></table>'; - + return $html2; } } diff --git a/includes/functions/functions_privacy.php b/includes/functions/functions_privacy.php index 8a5042b1e6..9d12d1dc33 100644 --- a/includes/functions/functions_privacy.php +++ b/includes/functions/functions_privacy.php @@ -80,7 +80,7 @@ function is_dead($indirec, $gedcom_id) { } else { return false; } - + // "1 DEAT Y" or "1 DEAT/2 DATE" or "1 DEAT/2 PLAC" if (preg_match('/\n1 (?:'.WT_EVENTS_DEAT.')(?: Y|(?:\n[2-9].+)*\n2 (DATE|PLAC) )/', $indirec)) { return true; @@ -368,7 +368,7 @@ function canDisplayRecord($ged_id, $gedrec) { if (isset($global_facts[$type])) { return $cache[$cache_key]=($global_facts[$type]>=$pgv_USER_ACCESS_LEVEL); } - + // No restriction found - must be public: return $cache[$cache_key]=true; } diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php index 9549a4e168..a17ee3996e 100644 --- a/includes/functions/functions_rtl.php +++ b/includes/functions/functions_rtl.php @@ -103,8 +103,8 @@ function spanLTRRTL($inputText, $direction='BOTH', $class='') { $endLTR = '</LTR>'; // This will become '</span>' at the end $startRTL = '<RTL>'; // This will become '<span dir="rtl">' at the end $endRTL = '</RTL>'; // This will become '</span>' at the end - $lenStart = strlen($startLTR); // RTL version MUST have same length - $lenEnd = strlen($endLTR); // RTL version MUST have same length + $lenStart = strlen($startLTR); // RTL version MUST have same length + $lenEnd = strlen($endLTR); // RTL version MUST have same length $previousState = ''; $currentState = strtoupper($TEXT_DIRECTION); @@ -376,7 +376,7 @@ function spanLTRRTL($inputText, $direction='BOTH', $class='') { // Lastly, do some more cleanups if ($debug) {echo '<b>Interim Output:</b>'; DumpString($result);} - + // Move leading RTL numeric strings to following LTR text // (this happens when the page direction is RTL and the original text begins with a number and is followed by LTR text) while (substr($result, 0, $lenStart+3) == $startRTL.WT_UTF8_LRE) { @@ -392,12 +392,12 @@ function spanLTRRTL($inputText, $direction='BOTH', $class='') { $result = $startLTR . substr($result, $lenStart, $spanEnd-$lenStart) . substr($result, $spanEnd+$lenStart+$lenEnd); break; } - + // On RTL pages, put trailing "." in RTL numeric strings into its own RTL span if ($TEXT_DIRECTION == 'rtl') { $result = str_replace(WT_UTF8_PDF.'.'.$endRTL, WT_UTF8_PDF.$endRTL.$startRTL.'.'.$endRTL, $result); } - + // Trim trailing blanks preceding <br /> in LTR text while ($previousState != 'RTL') { if (strpos($result, ' <LTRbr />') !== false) { diff --git a/includes/hitcount.php b/includes/hitcount.php index d9afcb0767..0dc81ab906 100644 --- a/includes/hitcount.php +++ b/includes/hitcount.php @@ -74,7 +74,7 @@ if ($page_parameter) { "SELECT page_count FROM `##hit_counter`". " WHERE gedcom_id=? AND page_name=? AND page_parameter=?" )->execute(array(WT_GED_ID, WT_SCRIPT_NAME, $page_parameter))->fetchOne(); - + // Only record one hit per session if ($page_parameter && empty($_SESSION['SESSION_PAGE_HITS'][WT_SCRIPT_NAME.$page_parameter])) { $_SESSION['SESSION_PAGE_HITS'][WT_SCRIPT_NAME.$page_parameter]=true; diff --git a/includes/session.php b/includes/session.php index a71ea07447..ed73db72e6 100644 --- a/includes/session.php +++ b/includes/session.php @@ -345,7 +345,7 @@ if ($MULTI_MEDIA) { require WT_ROOT.'includes/functions/functions_date.php'; // Use the server date to calculate privacy, etc. -// Use the client date to show ages, etc. +// Use the client date to show ages, etc. define('WT_SERVER_JD', timestamp_to_jd(time())); define('WT_CLIENT_JD', timestamp_to_jd(client_time())); diff --git a/individual.php b/individual.php index 1c1e5e05d4..6fcad1a7d4 100644 --- a/individual.php +++ b/individual.php @@ -114,7 +114,7 @@ jQuery(document).ready(function(){ <div id="indi_main_blocks"> <?php if ((empty($SEARCH_SPIDER))&&($controller->accept_success)) echo "<b>", i18n::translate('Changes successfully accepted into database'), "</b><br />"; - if ($controller->indi->isMarkedDeleted()) echo "<span class=\"error\">".i18n::translate('This record has been marked for deletion upon admin approval.')."</span>"; + if ($controller->indi->isMarkedDeleted()) echo "<span class=\"error\">".i18n::translate('This record has been marked for deletion upon admin approval.')."</span>"; if (strlen($controller->indi->getAddName()) > 0) echo "<span class=\"name_head\">", PrintReady($controller->indi->getAddName()), "</span><br />"; ?> <div id="indi_header"> @@ -139,9 +139,9 @@ jQuery(document).ready(function(){ } ?> </div> <div id="indi_name_details"> - <?php + <?php //Display name details - if ($controller->indi->canDisplayDetails()) { + if ($controller->indi->canDisplayDetails()) { $globalfacts=$controller->getGlobalFacts(); $nameSex = array('NAME', 'SEX'); foreach ($globalfacts as $key=>$value) { @@ -169,7 +169,7 @@ jQuery(document).ready(function(){ if ($age!="") $summary.= "<dl><dt class=\"label\">".i18n::translate('Age')."</dt><span class=\"field\">".get_age_at_event($age, true)."</span></dl>"; } $summary.=$controller->indi->format_first_major_fact(WT_EVENTS_DEAT, 2); - if ($SHOW_LDS_AT_GLANCE) { + if ($SHOW_LDS_AT_GLANCE) { $summary.="<dl><span><b>".get_lds_glance($controller->indi->getGedcomRecord())."</b></span></dl>"; } if ($summary) { @@ -210,13 +210,13 @@ jQuery(document).ready(function(){ }*/ ?> </div> - + <?php foreach ($controller->tabs as $tab) { echo $tab->getPreLoadContent(); -} +} ?> -<?php +<?php $showFull = ($PEDIGREE_FULL_DETAILS) ? 1 : 0; ?> </div> @@ -227,7 +227,7 @@ if (!$controller->indi->canDisplayDetails()) { print "</td></tr></table>"; } else { require './sidebar.php'; - + // Initially hide the sidebar controls & pin ====== ?> <script type="text/javascript"> @@ -252,7 +252,7 @@ if (!$controller->indi->canDisplayDetails()) { } else { // Non-AJAX tabs load immediately (search engines don't load ajax) echo '<li class="ui-state-default ui-corner-top"><a title="', $tab->getName(), '" href="#', $tab->getName(), '">'; - } + } echo '<span>', $tab->getTitle(), '</span></a></li>'; } } diff --git a/inverselink.php b/inverselink.php index 3e818ef03a..d8f9c07575 100644 --- a/inverselink.php +++ b/inverselink.php @@ -32,7 +32,7 @@ define('WT_SCRIPT_NAME', 'inverselink.php'); require './includes/session.php'; require WT_ROOT.'includes/functions/functions_edit.php'; - + //-- page parameters and checking $linktoid = safe_GET_xref('linktoid'); $mediaid = safe_GET_xref('mediaid'); @@ -137,17 +137,17 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFac print_findmedia_link("mediaid", "1media"); echo "</td></tr>"; } - + if (!isset($linktoid)) $linktoid = ""; echo '<tr><td class="descriptionbox">'; - + if ($linkto == "person") { echo i18n::translate('Enter Individual ID'), "</td>"; echo '<td class="optionbox wrap">'; if ($linktoid=="") { echo '<input class="pedigree_form" type="text" name="linktoid" id="linktopid" size="3" value="', $linktoid, '" />'; print_findindi_link("linktopid", ""); - + } else { $record=Person::getInstance($linktoid); echo '<b>', PrintReady($record->getFullName()), '</b> '; @@ -171,7 +171,7 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFac if ($TEXT_DIRECTION=="rtl") print getRLM(); } } - + if ($linkto == "source") { echo i18n::translate('Source'), "</td>"; echo '<td class="optionbox wrap">'; @@ -200,7 +200,7 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFac if ($TEXT_DIRECTION=="rtl") print getRLM(); } } - + if ($linkto == "note") { echo i18n::translate('Shared note'), "</td>"; echo '<td class="optionbox wrap">'; @@ -215,25 +215,25 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFac if ($TEXT_DIRECTION=="rtl") print getRLM(); } } - + echo '</td></tr>'; echo '<tr><td class="topbottombar" colspan="2"><input type="submit" value="', i18n::translate('Set link'), '" /></td></tr>'; echo '</table>'; echo '</form>'; echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', i18n::translate('Close Window'), '</a><br /></center>'; print_simple_footer(); - + } elseif ($action == "update" && $paramok) { linkMedia($mediaid, $linktoid); echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', i18n::translate('Close Window'), '</a><br /></center>'; print_simple_footer(); - + } else { echo '<center>nothing to do<center>'; echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', i18n::translate('Close Window'), '</a><br /></center>'; print_simple_footer(); } -} +} ?> diff --git a/lifespan.php b/lifespan.php index 55f678a3a8..6ea15ff4e6 100644 --- a/lifespan.php +++ b/lifespan.php @@ -323,7 +323,7 @@ var oldMx = 0; <td><input type="button" value="<?php print i18n::translate('Clear Chart'); ?>" onclick="window.location = 'lifespan.php?clear=1';" /></td> </tr> </table> - <?php + <?php $people = count($controller->people); print "<br /><b>".i18n::plural('%d Individual', '%d Individuals', $people, $people)."</b>"; ?> diff --git a/manageservers.php b/manageservers.php index ff904e0c28..f049f2a673 100644 --- a/manageservers.php +++ b/manageservers.php @@ -205,7 +205,7 @@ function showSite(siteID) { </script> <?php -// Search Engine IP address table +// Search Engine IP address table echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return to Administration page'), '" onclick="javascript:window.location=\'admin.php\'" /></p>', '<h2 class="center">', i18n::translate('Manage sites'), '</h2>', '<table class="width66" align="center">', @@ -687,11 +687,11 @@ if (check_media_structure()) { /* I've commented this out, as I have no idea what it is supposed to do. We've just deleted a * file, so why are we creating a new media object for it??? - + // Record changes to the Media object accept_all_changes($xref, WT_GED_ID); $objerec = find_gedcom_record($xref, WT_GED_ID); - + // Add the same file as a new object if ($finalResult && !$removeObject && $objerec!="") { $xref = get_new_xref("OBJE"); @@ -727,7 +727,7 @@ if (check_media_structure()) { // main link displayed on page $menu = new Menu(); - + // GEDFact assistant Add Media Links ======================= if (file_exists('modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) { $menu->addLabel(i18n::translate('Manage links')); @@ -735,7 +735,7 @@ if (check_media_structure()) { $menu->addClass("", "", "submenu"); $menu->addFlyout("left"); // Do not print submunu - + } else { $menu->addLabel(i18n::translate('Set link')); $menu->addOnclick("return ilinkitem('$mediaid', 'person')"); @@ -858,7 +858,7 @@ jQuery(document).ready(function(){ $showExternal = ($directory == $MEDIA_DIRECTORY) ? true : false; $medialist=get_medialist(true, $directory, false, false, $showExternal); - + // Get the list of media items /** * This is the default action for the page @@ -896,7 +896,7 @@ jQuery(document).ready(function(){ } print PrintReady(substr($directory, 0, -1)); print "<br />"; - + // Calculation to determine whether files are protected or not ------------------------- // Check if media directory and thumbs directory are empty $clean = false; @@ -916,7 +916,7 @@ jQuery(document).ready(function(){ } else { print "<div class=\"error\">".$directory." ".i18n::translate('Directory does not exist.')."</div>"; AddToLog('Directory does not exist.'.$directory, 'media'); - } + } // Thumbs directory check if (@is_dir(filename_decode($thumbdir))) { $handle = opendir(filename_decode($thumbdir)); @@ -942,10 +942,10 @@ jQuery(document).ready(function(){ if (!in_array($file, $BADMEDIA)) $thumbfiles_fw[] = $file; } closedir($handle); - } + } $protected_files = count($files_fw); $standard_files = count($files); - + print "<br />"; print "<form name=\"blah3\" action=\"media.php\" method=\"post\">"; print "<input type=\"hidden\" name=\"directory\" value=\"".$directory."\" />"; @@ -954,7 +954,7 @@ jQuery(document).ready(function(){ print "<input type=\"hidden\" name=\"action\" value=\"\" />"; print "<input type=\"hidden\" name=\"showthumb\" value=\"{$showthumb}\" />"; print "<input type=\"hidden\" name=\"sortby\" value=\"{$sortby}\" />"; - + if ($USE_MEDIA_FIREWALL) { if ($protected_files < $standard_files) { echo '<div class="error">'; @@ -963,14 +963,14 @@ jQuery(document).ready(function(){ echo i18n::translate('(a) Click the "Move ALL to Protected" button to move your media to the protected directory').'<br />'; echo i18n::translate('OR').'<br />'; echo i18n::translate('(b) Disable The Media Firewall Directory in the GEDCOM configuration section').'<br /><br />'; - echo '</div>'; + echo '</div>'; } print "<input type=\"submit\" value=\"".i18n::translate('Move ALL to standard')."\" onclick=\"this.form.action.value='movedirstandard'; \" />"; print "<input type=\"submit\" value=\"".i18n::translate('Move ALL to protected')."\" onclick=\"this.form.action.value='movedirprotected';\" />"; print help_link('move_mediadirs'); - print "<br />"; + print "<br />"; } - + if ( !$USE_MEDIA_FIREWALL && is_dir($MEDIA_FIREWALL_ROOTDIR.$MEDIA_DIRECTORY) ) { if ($protected_files > $standard_files) { echo '<div class="error">'; @@ -983,8 +983,8 @@ jQuery(document).ready(function(){ print "<input type=\"submit\" value=\"".i18n::translate('Move ALL to standard')."\" onclick=\"this.form.action.value='movedirstandard'; \" />"; print "<input type=\"submit\" value=\"".i18n::translate('Move ALL to protected')."\" onclick=\"this.form.action.value='movedirprotected';\" />"; print help_link('move_mediadirs'); - print "<br />"; - } + print "<br />"; + } } print "<input type=\"submit\" value=\"".i18n::translate('Correct read/write/execute permissions')."\" onclick=\"this.form.action.value='setpermsfix';\" />"; @@ -1057,7 +1057,7 @@ jQuery(document).ready(function(){ // Set up for two passes, the first showing URLs, the second normal files ?> <div align="center"> - <form class="tablesorter" method="post" action="media.php"> + <form class="tablesorter" method="post" action="media.php"> <table id="media_table" class="tablesorter" border="0" cellpadding="0" cellspacing="1"> <thead> <tr> diff --git a/medialist.php b/medialist.php index 77dde89f0e..ac891b3f6d 100644 --- a/medialist.php +++ b/medialist.php @@ -71,7 +71,7 @@ if ($reset == "Reset") { unset($_SESSION['Medialist']); unset($_SESSION['Filtered_medialist']); } - + if (empty($_SESSION['Medialist_ged'])) $_SESSION['Medialist_ged'] = WT_GEDCOM; if ($_SESSION['Medialist_ged'] != WT_GEDCOM) { $_SESSION['Medialist_ged'] = WT_GEDCOM; @@ -89,13 +89,13 @@ if (empty($folder)) { if (isset($_SESSION['Medialist'])) { $show = "yes"; $search = "yes"; - + // Build a new array? // Not if $action <> filter (ie It's either a layout/page change or a return visit) - // Load up the session variables + // Load up the session variables if ($action != "filter") { $medialist = ($_SESSION['Filtered_medialist']); - $folder=($_SESSION['Medialist_folder']); + $folder=($_SESSION['Medialist_folder']); $filter1=($_SESSION['Medialist_filter1']); $filter2=($_SESSION['Medialist_filter2']); $filter_type=($_SESSION['Filter_type']); @@ -105,13 +105,13 @@ if (isset($_SESSION['Medialist'])) { $currentdironly=($_SESSION['Medialist_currentdironly']); $show_thumbnail=($_SESSION['Medialist_thumbnail']); $exclude_links=($_SESSION['Medialist_links']); - - } else { + + } else { // This is a return visit and the FILTER button was used // Check if the subdirectory and folder have changed if ($MEDIA_DIRECTORY_LEVELS > 0) { if ($folder != $_SESSION['Medialist_folder']) $build = "yes"; - if ($currentdironly != $_SESSION['Medialist_currentdironly']) $build ="yes"; + if ($currentdironly != $_SESSION['Medialist_currentdironly']) $build ="yes"; } // Check if the 'Include media links' option has changed if ($exclude_links != $_SESSION['Medialist_links']) $build ="yes"; @@ -121,7 +121,7 @@ if (isset($_SESSION['Medialist'])) { $medialist = $_SESSION['Filtered_medialist']; $action = false; } else $medialist = $_SESSION['Medialist']; - } + } } } else { // This is the first visit to the medialist page @@ -178,7 +178,7 @@ if ($build == "yes") { if (!$disp) unset($medialist[$key]); } - + usort($medialist, "mediasort"); // Reset numbering of medialist array // save the array $_SESSION['Medialist'] = $medialist; @@ -194,7 +194,7 @@ $_SESSION['Medialist'] = $medialist; <form action="medialist.php" method="get"> <input type="hidden" name="action" value="filter" /> - <input type="hidden" name="search" value="yes" /> + <input type="hidden" name="search" value="yes" /> <table class="list-table center width75 <?php echo $TEXT_DIRECTION; ?>"> <?php if ($TEXT_DIRECTION=='ltr') { @@ -344,7 +344,7 @@ $_SESSION['Medialist'] = $medialist; <input type="checkbox" id="exclude_links" name="exclude_links" <?php if ($exclude_links) { ?>checked="checked"<?php } ?> /> <?php } ?> - </td> + </td> <!-- // end thumbnail option --> </tr></table> </form> @@ -368,7 +368,7 @@ if ($action=="filter" && (!empty($filtered_medialist))) { usort($filtered_medialist, "mediasort"); // Reset numbering of medialist array // If either of the filters is empty use the "and" filter } else $filter_type = $and; - } + } if ($filter_type == $and) { if ((strlen($filter1) > 1) || (strlen($filter2)) > 1) { @@ -397,7 +397,7 @@ if ($search=="yes") { $_SESSION['Medialist_max']=$max; $_SESSION['Medialist_columns']=$columns; $_SESSION['Medialist_currentdironly']=$currentdironly; - $_SESSION['Medialist_thumbnail']=$show_thumbnail; + $_SESSION['Medialist_thumbnail']=$show_thumbnail; $_SESSION['Medialist_links']=$exclude_links; } @@ -432,7 +432,7 @@ if ($show == "yes") { print"\n\t<table class=\"list_table\">\n"; // echo page back, page number, page forward controls - + echo "\n<tr><td colspan=\"2\">\n"; echo "\n\t<table class=\"list_table width100\">\n"; @@ -465,9 +465,9 @@ if ($show == "yes") { } echo "</td>"; - + echo "<td align=\"center\">", i18n::translate('Page %s of %s', $currentPage, $lastPage), "</td>"; - + echo "<td class=\"width30\" align=\"", $TEXT_DIRECTION == "ltr"?"right":"left", "\">"; if ($TEXT_DIRECTION=="ltr") { if ($ct>$max) { @@ -495,9 +495,9 @@ if ($show == "yes") { } } echo "</td>"; - + echo "</tr>\n</table></td></tr>"; - + // -- echo the array echo "\n<tr>\n"; @@ -533,7 +533,7 @@ if ($show == "yes") { // Get info on how to handle this media file $mediaInfo = mediaFileInfo($media["FILE"], $media["THUMB"], $media["XREF"], $name, $notes); - + //-- Thumbnail field if ($show_thumbnail) { echo '<a href="', $mediaInfo['url'], '">'; @@ -591,7 +591,7 @@ Plus other Media Options - MediaViewer page') . "\" />"; echo "<br />"; } } - + } // -- new naming structure --------- if ($sortby == 'title'){ @@ -619,9 +619,9 @@ Plus other Media Options - MediaViewer page') . "\" />"; echo "(", $media["XREF"], ")"; if ($TEXT_DIRECTION=="rtl") echo getRLM(); } - + echo "</a>"; - + if ($showFile) { echo "<br /><br /><sub><span dir=\"ltr\"><b>", PrintReady($name_disp4), ": </b>", PrintReady($name_disp2), "</span></sub>"; echo "<br /><sub><span dir=\"ltr\"><b>", i18n::translate('Location'), ": </b>", PrintReady($name_disp3), "</span></sub>"; @@ -667,8 +667,8 @@ Plus other Media Options - MediaViewer page') . "\" />"; // echo page back, page number, page forward controls echo "\n<tr><td colspan=\"2\">\n"; - - print"\n\t<table class=\"list_table width100\">\n"; + + print"\n\t<table class=\"list_table width100\">\n"; echo "\n<tr>\n"; echo "<td class=\"width30\" align=\"", $TEXT_DIRECTION == "ltr"?"left":"right", "\">"; if ($TEXT_DIRECTION=="ltr") { diff --git a/mediaviewer.php b/mediaviewer.php index 76987576b3..f6de7ad9a1 100644 --- a/mediaviewer.php +++ b/mediaviewer.php @@ -151,7 +151,7 @@ if (WT_USE_LIGHTBOX) { if ($controller->mediaobject->countLinkedFamilies()) { print_fam_table($controller->mediaobject->fetchLinkedFamilies(), $controller->mediaobject->getFullName()); } - + // Sources linked to this media object if ($controller->mediaobject->countLinkedSources()) { print_sour_table($controller->mediaobject->fetchLinkedSources(), $controller->mediaobject->getFullName()); diff --git a/module_admin.php b/module_admin.php index e27f0d629e..fd784b180e 100644 --- a/module_admin.php +++ b/module_admin.php @@ -212,14 +212,14 @@ print_header(i18n::translate('Module administration')); </style> <script type="text/javascript"> //<![CDATA[ - + function reindexMods(id) { jQuery('#'+id+' input').each( function (index, value) { value.value = index+1; }); } - + jQuery(document).ready(function(){ //-- tabs jQuery("#tabs").tabs(); @@ -230,19 +230,19 @@ print_header(i18n::translate('Module administration')); //-- update the order numbers after drag-n-drop sorting is complete jQuery('#menus_table').bind('sortupdate', function(event, ui) { var id = jQuery(this).attr('id'); - reindexMods(id); + reindexMods(id); }); jQuery('#tabs_table').bind('sortupdate', function(event, ui) { var id = jQuery(this).attr('id'); - reindexMods(id); + reindexMods(id); }); jQuery('#sidebars_table').bind('sortupdate', function(event, ui) { var id = jQuery(this).attr('id'); - reindexMods(id); + reindexMods(id); }); - + //-- enable the arrows buttons jQuery(".uarrow").click(function() { var curr = jQuery(this).parent().parent().get(0); @@ -279,9 +279,9 @@ print_header(i18n::translate('Module administration')); reindexMods('tabs_table'); reindexMods('sidebars_table'); }); - + // Table sorting and pageing - jQuery("#installed_table") + jQuery("#installed_table") .tablesorter({ sortList: [[2,0], [3,0]], widgets: ['zebra'], headers: { 0: { sorter: false }} @@ -301,7 +301,7 @@ print_header(i18n::translate('Module administration')); <p><?php echo i18n::translate('Below is the list of all the modules installed in this instance of webtrees. Modules are installed by placing them in the <i>modules</i> directory. Here you can set the access level per GEDCOM for each module. If a module includes tabs for the individual page or menus for the menu bar, you can also set the access level and order of each of them.')?></p> <p><input TYPE="button" VALUE="<?php echo i18n::translate('Return to Administration page');?>" onclick="javascript:window.location='admin.php'" /></p> <div id="tabs"> - <form method="post" action="module_admin.php"> + <form method="post" action="module_admin.php"> <input type="hidden" name="action" value="update_mods" /> <!-- page tabs --> <ul> @@ -350,7 +350,7 @@ print_header(i18n::translate('Module administration')); <td><?php if ($module instanceof WT_Module_Report) echo i18n::translate('Yes'); else echo i18n::translate('No');?></td> <td><?php if ($module instanceof WT_Module_Theme) echo i18n::translate('Yes'); else echo i18n::translate('No');?></td> </tr> - <?php + <?php } ?> </tbody> @@ -408,13 +408,13 @@ print_header(i18n::translate('Module administration')); } echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>'; echo edit_field_access_level($varname, $access_level); - } + } ?> </table> </td> </tr> <?php - $order++; + $order++; } ?> </tbody> @@ -455,13 +455,13 @@ print_header(i18n::translate('Module administration')); } echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>'; echo edit_field_access_level($varname, $access_level); - } + } ?> </table> </td> </tr> <?php - $order++; + $order++; } ?> </tbody> @@ -502,13 +502,13 @@ print_header(i18n::translate('Module administration')); } echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>'; echo edit_field_access_level($varname, $access_level); - } + } ?> </table> </td> </tr> <?php - $order++; + $order++; } ?> </tbody> @@ -542,13 +542,13 @@ print_header(i18n::translate('Module administration')); } echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>'; echo edit_field_access_level($varname, $access_level); - } + } ?> </table> </td> </tr> <?php - $order++; + $order++; } ?> </tbody> @@ -582,13 +582,13 @@ print_header(i18n::translate('Module administration')); } echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>'; echo edit_field_access_level($varname, $access_level); - } + } ?> </table> </td> </tr> <?php - $order++; + $order++; } ?> </tbody> @@ -622,13 +622,13 @@ print_header(i18n::translate('Module administration')); } echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>'; echo edit_field_access_level($varname, $access_level); - } + } ?> </table> </td> </tr> <?php - $order++; + $order++; } ?> </tbody> @@ -662,13 +662,13 @@ print_header(i18n::translate('Module administration')); } echo '<tr><td>', htmlspecialchars($ged_name), '</td><td>'; echo edit_field_access_level($varname, $access_level); - } + } ?> </table> </td> </tr> <?php - $order++; + $order++; } ?> </tbody> diff --git a/pgv_to_wt.php b/pgv_to_wt.php index 479720af7e..512bac3d06 100644 --- a/pgv_to_wt.php +++ b/pgv_to_wt.php @@ -109,7 +109,7 @@ if ($PGV_PATH) { if ($error || empty($PGV_PATH)) { // Prompt for location of PhpGedView installation echo '<div id="container">'; - echo + echo '<h2>', i18n::translate('PhpGedView to <b>webtrees</b> transfer wizard'), help_link('PGV_WIZARD'), @@ -147,7 +147,7 @@ WT_DB::exec("DELETE FROM `##user_setting`"); WT_DB::exec("DELETE FROM `##user`"); //////////////////////////////////////////////////////////////////////////////// -if (ob_get_level() == 0) ob_start(); +if (ob_get_level() == 0) ob_start(); echo '<p>config.php => wt_site_setting ...</p>'; ob_flush(); flush(); usleep(50000); // TODO May need to set 'DATA_DIRECTORY' to $INDEX_DIRECTORY when dealing with media?? @set_site_setting('STORE_MESSAGES', $PGV_STORE_MESSAGES); @@ -183,7 +183,7 @@ WT_DB::prepare( " SELECT site_setting_name, site_setting_value FROM {$DBNAME}.{$TBLPREFIX}site_setting". " WHERE site_setting_name IN ('DEFAULT_GEDCOM', 'LAST_CHANGE_EMAIL')" )->execute(); - + //////////////////////////////////////////////////////////////////////////////// if ($PGV_SCHEMA_VERSION>=12) { @@ -341,7 +341,7 @@ echo '<p>pgv_gedcom => wt_gedcom ...</p>'; ob_flush(); flush(); usleep(50000); } } } - + // Migrate the data from pgv_users into pgv_user/pgv_user_setting/pgv_user_gedcom_setting echo '<p>pgv_users => wt_user ...</p>'; ob_flush(); flush(); usleep(50000); try { diff --git a/reportengine.php b/reportengine.php index be85963e9e..c794863c95 100644 --- a/reportengine.php +++ b/reportengine.php @@ -201,7 +201,7 @@ elseif ($action=="setup") { } <?php echo WT_JS_END; - + init_calendar_popup(); echo "<form name=\"setupreport\" method=\"get\" target=\"_blank\" action=\"reportengine.php\">\n"; echo "<input type=\"hidden\" name=\"action\" value=\"run\" />\n"; diff --git a/search.php b/search.php index 313b30dc7f..782765f125 100644 --- a/search.php +++ b/search.php @@ -527,7 +527,7 @@ if ($controller->action == "general" || $controller->action == "soundex") { <td class="list_value" style="padding: 5px;" colspan="2"> <?php - //-- sorting menu by gedcom filename + //-- sorting menu by gedcom filename asort($all_gedcoms); foreach ($all_gedcoms as $ged_id=>$gedcom) { $str = str_replace(array (".", "-", " "), array ("_", "_", "_"), $gedcom); @@ -1068,5 +1068,4 @@ function to_mb($str) { if (substr($str, -1, 1)=='G') { return floor(1024*substr($str, 0, strlen($str)-1)); } - } diff --git a/sidebar.php b/sidebar.php index ee033ba042..0ba86496dd 100644 --- a/sidebar.php +++ b/sidebar.php @@ -44,7 +44,7 @@ if ($sb_action!='none') { var $pid; var $famid; } - + $controller = new tempController(); $pid = safe_GET_xref('pid', ''); @@ -67,7 +67,7 @@ if ($sb_action!='none') { if (!empty($sid)) { $controller->sid = $sid; } - + if ($sb_action=='loadMods') { $counter = 0; foreach($sidebarmods as $mod) { @@ -79,7 +79,7 @@ if ($sb_action!='none') { <?php if ($counter==0) echo $mod->getSidebarContent(); else {?><img src="<?php echo WT_THEME_DIR ?>images/loading.gif" /><?php }?> </div> - <?php + <?php $counter++; } } @@ -124,12 +124,12 @@ if (isset($controller)) { <?php // Sidebar state control // NOTE: Need config option for setting $sidebar_state. -$sidebar_state = "open"; // "open" = Sidebar initially open, [default] + normally auto pinned +$sidebar_state = "open"; // "open" = Sidebar initially open, [default] + normally auto pinned // "closed" = Sidebar initially closed, + normally auto unpinned -// +// ?> - -<script type="text/javascript" src="js/jquery/jquery.scrollfollow.js"></script> + +<script type="text/javascript" src="js/jquery/jquery.scrollfollow.js"></script> <script type="text/javascript"> <!-- jQuery.noConflict(); // @see http://docs.jquery.com/Using_jQuery_with_Other_Libraries/ @@ -147,12 +147,12 @@ function closeCallback() { map.setMapType(<?php echo $GOOGLEMAP_MAP_TYPE; ?>); SetMarkersAndBounds(); ResizeMap(); - } + } } function openCallback() { jQuery('#sidebarAccordion').accordion({ - /* fillSpace: true, */ + /* fillSpace: true, */ autoHeight: false, changestart: function(event, ui) { loadedMods[ui.oldHeader.attr('title')] = true; @@ -166,13 +166,13 @@ function openCallback() { loadMap(); map.setMapType(<?php echo $GOOGLEMAP_MAP_TYPE; ?>); SetMarkersAndBounds(); - ResizeMap(); - } + ResizeMap(); + } } jQuery(document).ready(function() { - - // Sidebar Pin Function + + // Sidebar Pin Function jQuery('#sidebar_pin').toggle( function() { jQuery('#sidebar_pin img').attr('src', '<?php echo $WT_IMAGES['pin-in'];?>').attr('title', '<?php echo i18n::translate('Unpin Sidebar');?>'); @@ -189,11 +189,11 @@ jQuery(document).ready(function() { jQuery('#sidebar_pin').click(); <?php } ?> // --------------------- - + var modsLoaded = false; - + // Sidebar Open/Close Function - // Sidebar Open + // Sidebar Open jQuery('#sidebar_open').toggle(function() { jQuery('#sidebar_open img').attr('style', 'margin-left:255px;' ).attr('src', '<?php echo $WT_IMAGES['slide_close'];?>').attr('title', '<?php echo i18n::translate('Sidebar Close');?>'); jQuery('#sidebar').animate({ @@ -209,20 +209,20 @@ jQuery(document).ready(function() { } jQuery('#sidebarAccordion').show(); jQuery('#sidebar_pin').show(); - // Shift content + // Shift content var newwidth = 310; newwidth = jQuery('#tabs').width() - newwidth; // NOTE: REM next line to avoid the "page shift" when Navigator is opened. (Purely a preference choice) jQuery('#tabs > div').css('width', newwidth+'px'); - // + // <?php if ($sidebar_state == "open" ) { ?> jQuery('#sidebar_pin').click(); <?php } ?> <?php if ($sidebar_state == "open") { ?> jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=true&sb_closed=false'); - <?php } ?> - + <?php } ?> + <?php if ($sidebar_state == "closed") { ?> <?php if (isset($_SESSION['WT_pin']) && $_SESSION['WT_pin']) { ?> jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=true&sb_closed=false'); @@ -231,45 +231,45 @@ jQuery(document).ready(function() { <?php } ?> <?php } ?> sb_open=true; - // Sidebar Close + // Sidebar Close }, function() { jQuery('#sidebar_open img').attr('style', 'margin-left:0px;' ).attr('src', '<?php echo $WT_IMAGES['slide_open'];?>').attr('title', '<?php echo i18n::translate('Sidebar Open');?>'); jQuery('#sidebar').css('left', ''); jQuery('#sidebar').animate({ right: "4px", width: "0px" - }, 500, 'linear', closeCallback); - // Shift content back + }, 500, 'linear', closeCallback); + // Shift content back jQuery('#tabs div').css('width', ''); - // + // <?php if ($sidebar_state == "open" ) { ?> jQuery('#sidebar_pin').click(); <?php } ?> - + jQuery.get('individual.php?pid=<?php echo $controller->pid;?>&action=ajax&pin=false&sb_closed=true'); sb_open=false; - }); + }); // ----------------------------- - + <?php if ( $sidebar_state == "open" ) { ?> <?php if ( isset($_SESSION['WT_pin']) && $_SESSION['WT_pin'] || !isset($_SESSION['WT_sb_closed']) ) { ?> jQuery('#sidebar_open').click(); - jQuery('#sidebar_controls').show(); + jQuery('#sidebar_controls').show(); if ( pinned == false ) { jQuery('#sidebar_pin').click(); } <?php } else { ?> - jQuery('#sidebar_controls').show(); + jQuery('#sidebar_controls').show(); <?php } ?> <?php } ?> - + <?php if ( $sidebar_state == "closed" ) { ?> if ( pinned == true) { jQuery('#sidebar_open').click(); } jQuery('#sidebar_controls').show(); <?php } ?> - + }); --> </script> @@ -279,19 +279,19 @@ jQuery(document).ready(function() { if ( isset($_SESSION['WT_pin']) && $_SESSION['WT_pin'] && $sidebar_state == "open") { ?> <div id="sidebar_controls" class="ui-accordion-header ui-helper-reset ui-state-active ui-corner-top ui-state-focus"> - <a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGES['slide_close'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> - <a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGES['pin-out'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> + <a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGES['slide_close'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> + <a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGES['pin-out'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> </div> <?php } else { ?> <div id="sidebar_controls" class="ui-accordion-header ui-helper-reset ui-state-active ui-corner-top ui-state-focus"> - <a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGES['slide_open'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> - <a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGES['pin-out'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> + <a id="sidebar_open" href="#open"><img style="margin-left:0px;" src="<?php echo $WT_IMAGES['slide_open'];?>" border="0" title="<?php echo i18n::translate('Sidebar Open');?>" alt="" /></a> + <a id="sidebar_pin" href="#pin"><img src="<?php echo $WT_IMAGES['pin-out'];?>" border="0" title="<?php echo i18n::translate('Pin Sidebar');?>" alt="" /></a> </div> <?php } - ?> + ?> <div id="sidebarAccordion"></div> <span class="ui-icon ui-icon-grip-dotted-horizontal" style="margin:2px auto;"></span> </div> diff --git a/statistics.php b/statistics.php index 2b9b679ce7..f29c1f98ad 100644 --- a/statistics.php +++ b/statistics.php @@ -417,7 +417,7 @@ if (isset($content) && $content==1) { <div id="pagetab3" class="<?php echo $TEXT_DIRECTION; ?>"> <fieldset> <legend><?php echo i18n::translate('Create your own chart'); ?></legend> - <?php + <?php require_once WT_ROOT.'includes/functions/functions_places.php'; if ($ENABLE_AUTOCOMPLETE) require WT_ROOT.'js/autocomplete.js.htm'; @@ -728,7 +728,7 @@ if (isset($content) && $content==1) { </fieldset> <br /> </div> - <?php } + <?php } } else { print_header(i18n::translate('Statistics')); $ble = false; @@ -736,7 +736,7 @@ if (isset($content) && $content==1) { <h2 class="center"><?php echo i18n::translate('Statistics'); ?></h2> <?php global $TEXT_DIRECTION; if ($TEXT_DIRECTION=='rtl') $align='right'; - else $align='left'; + else $align='left'; ?> <script type="text/javascript" src="js/jquery/jquery.min.js"></script> <script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script> diff --git a/statisticsplot.php b/statisticsplot.php index e0f281a6f7..1f4b2e4ff8 100644 --- a/statisticsplot.php +++ b/statisticsplot.php @@ -466,7 +466,6 @@ function nuch() { } $zstart=$boundary+1; } - } } diff --git a/useradmin.php b/useradmin.php index 5dc7f699db..3d442dfde6 100644 --- a/useradmin.php +++ b/useradmin.php @@ -96,7 +96,7 @@ if (empty($ged)) { // Load all available gedcoms $all_gedcoms = get_all_gedcoms(); -//-- sorting by gedcom filename +//-- sorting by gedcom filename asort($all_gedcoms); // Delete a user @@ -487,7 +487,7 @@ jQuery(document).ready(function(){ </script> <?php // Then show the users - + echo '<p class="center"><input TYPE="button" VALUE="', i18n::translate('Return to Administration page'), '" onclick="javascript:window.location=\'admin.php\'" /></p>', '<h2 class="center">', i18n::translate('User List'), '</h2>'; ?> @@ -606,7 +606,7 @@ jQuery(document).ready(function(){ echo "</tr>\n"; } ?> - + </tbody> </table><br /> <div id="pager" class="pager"> diff --git a/wtinfo.php b/wtinfo.php index 7d6496b931..fe172eb7d5 100644 --- a/wtinfo.php +++ b/wtinfo.php @@ -42,11 +42,11 @@ if (!isset($action)) $action = ""; if ($action == "phpinfo") { $helpindex = "phpinfo_help"; print_header(i18n::translate('PHP information')); - + echo '<div class="center">'; echo '<p><input TYPE="button" VALUE="', i18n::translate('Return to Administration page'), '" onclick="javascript:window.location=\'admin.php\'" /></p>'; echo '<p><h2>', i18n::translate('PHP information'), '</h2></p>'; - + ob_start(); phpinfo(); |