Commit b283b9c8 authored by metzlerd's avatar metzlerd
Browse files

Notice fixes.

parent 175834fd
......@@ -42,7 +42,7 @@ class FrxMenu {
$name = $url;
// Determine if the report has an extention that is one of the docuemnt types
$p = pathinfo($url);
if (array_search($p['extension'], $this->doc_formats)!==FALSE) {
if (isset($p['extension']) && array_search($p['extension'], $this->doc_formats)!==FALSE) {
$name = $p['filename'];
$format = $p['extension'];
}
......
......@@ -160,7 +160,7 @@ class FrxRepoMan {
* @param string $clause order / where cause
* @return unknown
*/
function data($data_block, $parameters=array()) {
function data($data_block) {
list($provider, $block_name) = explode('/', $data_block, 2);
$repos = @$this->repositories[$provider];
if (isset($repos['enabled']) && !$repos['enabled']) {
......@@ -183,18 +183,18 @@ class FrxRepoMan {
if ($o) {
$access = TRUE;
$block = $o->loadBlock($block_name);
$right = $block['access'];
$right = @$block['access'];
if ($block && $o->access($right)) {
switch ($block['type']) {
case 'sql':
$xml = $o->sqlData($block['source'], $parameters);
$xml = $o->sqlData($block['source']);
break;
case 'file':
$xml = $o->xmlData($block['source'], $parameters);
$xml = $o->xmlData($block['source']);
break;
case 'class':
break;
$xml = $o->phpData($o, $block['method']);
break;
}
}
......
......@@ -32,7 +32,7 @@ class FrxDrupal extends FrxDataSource {
* @param Array $parm_data
* @param Query $subQuery
*/
public function sqlData($block_name, $params=array()) {
public function sqlData($block_name) {
// Load the block from the file
$block = $this->loadBlock($block_name);
$xml ='';
......
......@@ -70,7 +70,7 @@ class FrxMSSQL extends FrxDataSource {
$sql = $this->te->replace($sql);
if ($this->use_mssql_xml) {
$xml = $this->mssql_xml($sql, $tag);
$xml = $this->mssql_xml($sql, 'table');
}
else {
$xml = $this->php_xml($sql);
......
......@@ -57,7 +57,7 @@ class FrxOracle extends FrxDataSource {
* @param Array $parm_data
* @param Query $subQuery
*/
public function sqlData($sql, $params=array()) {
public function sqlData($sql) {
// Load the block from the file
$db = $this->db;
$xml ='';
......@@ -73,7 +73,7 @@ class FrxOracle extends FrxDataSource {
$sql = $this->te->replace($sql);
if ($this->use_oracle_xml) {
$xml = $this->oracle_xml($sql, $block_name);
$xml = $this->oracle_xml($sql, 'table');
}
else {
$xml = $this->php_xml($sql);
......
......@@ -75,7 +75,7 @@ class FrxPDO extends FrxDataSource {
* @param Array $parm_data
* @param Query $subQuery
*/
public function sqlData($sql, $params=array()) {
public function sqlData($sql) {
// Load the block from the file
$db = $this->db;
$xml ='';
......
......@@ -55,14 +55,15 @@ class FrxPostgres extends FrxDataSource {
* @param Array $parm_data
* @param Query $subQuery
*/
public function sqlData($sql, $params=array()) {
public function sqlData($sql) {
// Load the block from the file
$db = $this->db;
$xml ='';
if ($sql && $db) {
$sql = $this->te->replace($sql);
if ($this->use_postgres_xml) {
$xml = $this->postgres_xml($sql, $block_name);
$xml = $this->postgres_xml($sql, 'table');
}
else {
$xml = $this->php_xml($sql);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment