diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-09-10 17:55:33 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-09-10 17:55:33 +0000 |
| commit | 9b5fbf4d0de5d867fb509527f89876f1a9f4de7a (patch) | |
| tree | c874c61d6d379160866b83fbbf2f28eb355bf0c3 /includes/controllers | |
| parent | 7aabfda984ee9ad21cbf1d23d2831212b1891cb5 (diff) | |
| download | webtrees-9b5fbf4d0de5d867fb509527f89876f1a9f4de7a.tar.gz webtrees-9b5fbf4d0de5d867fb509527f89876f1a9f4de7a.tar.bz2 webtrees-9b5fbf4d0de5d867fb509527f89876f1a9f4de7a.zip | |
Tidy up some whitespace/formatting
Diffstat (limited to 'includes/controllers')
| -rw-r--r-- | includes/controllers/individual_ctrl.php | 22 | ||||
| -rw-r--r-- | includes/controllers/media_ctrl.php | 6 | ||||
| -rw-r--r-- | includes/controllers/note_ctrl.php | 2 | ||||
| -rw-r--r-- | includes/controllers/pedigree_ctrl.php | 4 | ||||
| -rw-r--r-- | includes/controllers/remotelink_ctrl.php | 34 |
5 files changed, 34 insertions, 34 deletions
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 |
