kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[fix] work with 1.x

This commit is contained in:
alban 2014-07-02 22:51:01 +02:00
parent 234568a6ed
commit ad444849c2
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Alternc/Diagnostic/Service/Dns.php
View File

@ -32,8 +32,12 @@ class Alternc_Diagnostic_Service_Dns
/** @var m_dom */ /** @var m_dom */
global $dom; global $dom;
$this->domainList = $dom->get_domain_all_summary(); if( !is_a($dom, "system_bind")){
$this->data->setMetadata("Alternc 1.x: can't read DNS");
return $this->data;
}
// Writes the domains list // Writes the domains list
$this->writeSectionData (self::SECTION_LIST,$this->domainList); $this->writeSectionData (self::SECTION_LIST,$this->domainList);
@ -108,4 +112,4 @@ class Alternc_Diagnostic_Service_Dns
return $this->dom->enum_slave_account(); return $this->dom->enum_slave_account();
} }
} }

12
src/diagnostic.php
View File

@ -91,7 +91,7 @@ function __autoload($class_name)
} else { } else {
$file_name = $class_name . '.php'; $file_name = $class_name . '.php';
} }
// Attempts to find file in namespace // Attempts to find file in namespace
foreach($srcPathList as $namespace => $path ){ foreach($srcPathList as $namespace => $path ){
$file_path = $path.DIRECTORY_SEPARATOR.$file_name; $file_path = $path.DIRECTORY_SEPARATOR.$file_name;
@ -112,7 +112,15 @@ function __autoload($class_name)
// ================================================================== // ==================================================================
// ================================================================== // ==================================================================
require_once("/usr/share/alternc/panel/class/config_nochk.php"); // alternc 1.0
if(is_file("/usr/share/alternc/panel/class/config_nochk.php")){
require_once("/usr/share/alternc/panel/class/config_nochk.php");
}else{
require_once("/var/alternc/bureau/class/config_nochk.php");
include "../bureau/class/class_system_bind.php";
}