Skip to content

Commit

Permalink
BugFix: error on Configuration Management solved
Browse files Browse the repository at this point in the history
Signed-off-by: Taggic <taggic@t-online.de>
  • Loading branch information
Taggic committed Jan 27, 2012
1 parent 8126b46 commit e5abbef
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 55 deletions.
14 changes: 0 additions & 14 deletions conf/default.php

This file was deleted.

9 changes: 0 additions & 9 deletions conf/metadata.php

This file was deleted.

6 changes: 6 additions & 0 deletions config.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/\<code\>.*^\<\/code\>/smU
/\<file\>.*^\<\/file\>/smU
/\<nowiki\>.*^\<\/nowiki\>/smU
/%%.*^%%/smU
/\<html\>.*^\<\/html\>/smU
/\<php\>.*^\<\/php\>/smU
10 changes: 0 additions & 10 deletions lang/en/settings.php

This file was deleted.

29 changes: 7 additions & 22 deletions syntax.php
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,8 @@ function _get_allMediaLinks($listPageFiles, $defFileTypes) {

// get all defined tags where media links inbetween are to be ignored
$ignore_tags = array();
$ignore_tags = $this->getConf('ignore_tags');
$ignore_tags = parse_ini_file(DOKU_PLUGIN."orphanmedia/config.ini");
// echo var_dump($ignore_tags);

foreach($listPageFiles as $page_filepath) {
$_all_links[$pageCounter][0] = $page_filepath;
Expand Down Expand Up @@ -566,27 +567,10 @@ function array_flat($array) {
}
//---------------------------------------------------------------------------------------
function clean_link($xBody)
{
// evaluate the media link by DW embedded function
{ // evaluate the media link by DW embedded function
$link = Doku_Handler_Parse_Media($xBody);
if (stripos($link['src'],'>') === false) $xBody = $link['src'];
else $xBody = '';
// $link = array('type', 'src', 'title', 'align', 'width', 'height', 'cache', 'linking')
/* if(($link['type']=='internalmedia') && (stripos($link['src'],'>')=== false)) {
$xBody = $link['src'];
}
elseif(($link['type']=='externalmedia') && (stripos($link['src'],'>')=== false)) {
$t_flag = $this->url_exist($link['src']);
// if($t_flag===false) msg('URL does NOT exist: <a href="'.$link['src'].'" title="'.$link['src'].'" rel="nofollow">'.$link['src'].'</a>',-1);
// else msg('URL does exist: <a href="'.$link['src'].'" title="'.$link['src'].'" rel="nofollow">'.$link['src'].'</a>',1);
if($t_flag===true) $xBody = $link['src'];
if(stristr($link['src'], "http:")!==false) echo $xBody.'<br />';
if($t_flag===true) msg('URL does exist: <a href="'.$link['src'].'" title="'.$link['src'].'" rel="nofollow">'.$link['src'].'</a>',1);
}
else {
// msg('URL does NOT exist: <a href="'.$link['src'].'" title="'.$link['src'].'" rel="nofollow">'.$link['src'].'</a>',-1);
$xBody = '';
} */
return $xBody;
}
// ---------------------------------------------------------------
Expand All @@ -602,7 +586,7 @@ function _prepare_output($m_link,$page,$img,$counter)

// check for linke type and handle accordingly
// fileshares or UNC links
if (( preg_match('/^\\\\\\\\[^\\\\]+?\\\\/u',$m_link) ) || (substr($m_link, 0, 1) == '\\')) {
/* if (( preg_match('/^\\\\\\\\[^\\\\]+?\\\\/u',$m_link) ) || (substr($m_link, 0, 1) == '\\')) {
// 'windowslink' or shares
// do not modify the link
$t2 = '<a class=wikilink1 href="'.$t1;
Expand All @@ -615,9 +599,10 @@ function _prepare_output($m_link,$page,$img,$counter)
}
// turn it into wiki link without "pages"
/* $t1= html_wikilink($t1,$t1); */
else {
// else {
$t2 = str_replace("/", ":", $t1);
}
// }

$t2 = '<a class=wikilink1 href="'. DOKU_URL . "doku.php?id=" . substr($t2, 1, strlen($t2));
$t1 = $t2 . '" title="' . $t1 . '" rel="nofollow">' . $t1 . '</a>';

Expand Down

0 comments on commit e5abbef

Please sign in to comment.