diff options
Diffstat (limited to 'h-source/Application/Controllers')
| -rw-r--r-- | h-source/Application/Controllers/DownloadController.php | 25 | ||||
| -rw-r--r-- | h-source/Application/Controllers/WikiController.php | 7 |
2 files changed, 28 insertions, 4 deletions
diff --git a/h-source/Application/Controllers/DownloadController.php b/h-source/Application/Controllers/DownloadController.php index fba20f0..bfc4346 100644 --- a/h-source/Application/Controllers/DownloadController.php +++ b/h-source/Application/Controllers/DownloadController.php @@ -92,7 +92,7 @@ class DownloadController extends BaseController { $xml .= "\t\t<compatibility>".$row['hardware']['compatibility']."</compatibility>\n"; } - + if ($type === 'notebook') { $xml .= "\t\t<wifi_card>".$row['hardware']['wifi_type']."</wifi_card>\n"; @@ -128,7 +128,17 @@ class DownloadController extends BaseController $xml .= "\t\t<it_works>".$row['hardware']['video_card_works']."</it_works>\n"; } - $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard'); + if ($type === 'acquisition-card') + { + $xml .= "\t\t<it_works>".$row['hardware']['compatibility']."</it_works>\n"; + } + + if ($type === 'fingerprint-reader') + { + $xml .= "\t\t<it_works>".$row['hardware']['fingerprint_works']."</it_works>\n"; + } + + $devicesWithDriverEntry = array('printer','scanner','soundcard','webcam','bluetooth','wifi','videocard','acquisition-card','fingerprint-reader'); if (in_array($type,$devicesWithDriverEntry)) { $xml .= "\t\t<driver>".$row['hardware']['driver']."</driver>\n"; @@ -209,5 +219,14 @@ class DownloadController extends BaseController { $this->printXml($lang, array('type'=>'bluetooth','-deleted'=>'no')); } - + + public function acquisitioncards($lang = 'en') + { + $this->printXml($lang, array('type'=>'acquisition-card','-deleted'=>'no')); + } + + public function fingerprintreaders($lang = 'en') + { + $this->printXml($lang, array('type'=>'fingerprint-reader','-deleted'=>'no')); + } }
\ No newline at end of file diff --git a/h-source/Application/Controllers/WikiController.php b/h-source/Application/Controllers/WikiController.php index 8f389e5..0e05ffd 100644 --- a/h-source/Application/Controllers/WikiController.php +++ b/h-source/Application/Controllers/WikiController.php @@ -61,6 +61,7 @@ class WikiController extends BaseController if ($this->m['WikiModel']->queryResult) { header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$this->m['WikiModel']->lastTitleClean); + die(); } } @@ -120,6 +121,7 @@ class WikiController extends BaseController if ($this->m['WikiModel']->queryResult) { header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$this->m['WikiModel']->lastTitleClean); + die(); } } @@ -140,6 +142,7 @@ class WikiController extends BaseController else { header('Location: http://'.DOMAIN_NAME."/users/login/".$this->lang."?redirect=".$this->controller."/page/".$this->lang."/".titleForRedirect($title)); + die(); } } else @@ -200,6 +203,7 @@ class WikiController extends BaseController $newTitle = $this->m['WikiModel']->getTheModelName($clean['idWiki']); $n = titleForRedirect($newTitle); header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$n); + die(); } else { @@ -425,6 +429,7 @@ class WikiController extends BaseController if ($this->m['WikiModel']->queryResult) { header('Location: http://'.DOMAIN_NAME.'/wiki/page/'.$this->lang.'/'.$this->m['WikiModel']->lastTitleClean); + die(); } $data['notice'] = $this->m['WikiModel']->notice; @@ -476,7 +481,7 @@ class WikiController extends BaseController if ($this->m['WikitalkModel']->queryResult) { header('Refresh: 0;url=http://'.DOMAIN_NAME.$_SERVER['REQUEST_URI']); - exit; + die(); } } } |