Update of /cvsroot/phpslash/phpslash-dev/include/class
In directory sc8-pr-cvs1:/tmp/cvs-serv1534/phpslash-dev/include/class
Modified Files:
slashTemplate.class
Log Message:
slashTemplate.class - get the correct template when current language is not the default language.
Index: slashTemplate.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/slashTemplate.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slashTemplate.class 24 Jun 2003 19:32:34 -0000 1.5
--- slashTemplate.class 1 Dec 2003 19:07:06 -0000 1.6
***************
*** 91,103 ****
$skin_cfg = '';
$skin_cfg = parse_ini_file($templatedir ."/skin.ini");
! if(!empty($skin_cfg['skin.parent.language'])) {
$language = $skin_cfg['skin.parent.language'];
}
if($this->set_file($varname, $filename, $skin_cfg['skin.parent'], $language)) {
// template in current language / parent skin
! $status = true;
} elseif($this->set_file($varname, $filename, $skin_cfg['skin.parent'], $this->psl['language.default'])) {
// template in default language / parent skin
! $status = true;
}
// $status = false;
--- 91,103 ----
$skin_cfg = '';
$skin_cfg = parse_ini_file($templatedir ."/skin.ini");
! if(!empty($skin_cfg['skin.parent.language'])) {
$language = $skin_cfg['skin.parent.language'];
}
if($this->set_file($varname, $filename, $skin_cfg['skin.parent'], $language)) {
// template in current language / parent skin
! $status = true;
} elseif($this->set_file($varname, $filename, $skin_cfg['skin.parent'], $this->psl['language.default'])) {
// template in default language / parent skin
! $status = true;
}
// $status = false;
***************
*** 107,113 ****
// no parent skin
! // try to find template in module/template, skin/module, or in
! // defaultskin directory.
! if(file_exists($this->psl['moduledir'] ."/". $this->psl['module'][$this->psl['module']['module.current']] ."/templates/" . basename($filename))) {
// module templates in module subdirectory
$filepath = $this->psl['moduledir'] ."/". $this->psl['module'][$this->psl['module']['module.current']] ."/templates/" . basename($filename);
--- 107,113 ----
// no parent skin
! // try to find template in module/template, skin/module, or in
! // defaultskin directory.
! if(file_exists($this->psl['moduledir'] ."/". $this->psl['module'][$this->psl['module']['module.current']] ."/templates/" . basename($filename))) {
// module templates in module subdirectory
$filepath = $this->psl['moduledir'] ."/". $this->psl['module'][$this->psl['module']['module.current']] ."/templates/" . basename($filename);
***************
*** 117,121 ****
$filepath = $templatedir ."/". $this->psl['module'][$this->psl['module']['module.current']] ."/". basename($filename);
$status = Template::set_file($varname, $filepath);
! } elseif(!$this->set_file($varname, $filename, $this->psl['defaultskin'], $this->psl['language.default'])) {
// template isn't in the defaults either - bail out
$this->message = "set_file: set_file: For varname $varname filename $filepath is invalid.";
--- 117,124 ----
$filepath = $templatedir ."/". $this->psl['module'][$this->psl['module']['module.current']] ."/". basename($filename);
$status = Template::set_file($varname, $filepath);
! } elseif($this->set_file($varname, $filename, $this->psl['defaultskin'], $this->psl['language.default'])) {
! // template in default language / default skin
! $status = true;
! } else {
// template isn't in the defaults either - bail out
$this->message = "set_file: set_file: For varname $varname filename $filepath is invalid.";
***************
*** 123,131 ****
$status = false;
}
! // $status = true;
! }
!
! // return $status;
!
} else {
reset($varname);
--- 126,131 ----
$status = false;
}
! }
!
} else {
reset($varname);
|