franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

internal links in procedure

Browse Source
This commit is contained in:
Franzz
2014-09-07 21:08:09 +02:00
parent f3bd550c28
commit 89d3443ebb
6 changed files with 2649 additions and 2656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/databap.php
View File

@@ -1159,7 +1159,7 @@ class Databap extends PhpObject
$asTable['title'] = self::getTableFormat($asTable['title']);
$asTable['description'] = self::getDescriptionFormat($asTable['description']);
$asTable['led'] = self::getDateFormat($asTable['led']);
$asTable['formatted_keywords'] = str_replace("\n", '<br />', ToolBox::findReplaceLinks($asTable['keywords']));
$asTable['formated_keywords'] = ToolBox::formatText($asTable['keywords']);
}
}
return $asTable;
@@ -2621,7 +2621,7 @@ class Databap extends PhpObject
public static function getDescriptionFormat($sDescription)
{
return ToolBox::mb_ucfirst($sDescription);
return ToolBox::mb_ucfirst(ToolBox::findReplaceLinks($sDescription));
}
public static function getTableFormat($sTable)

27
inc/procedure.php
View File

@@ -229,27 +229,18 @@ class Procedure extends PhpObject
public function getProcedure()
{
// [id_step]=>text
// [id_step][id_image]=>array('name'=>file name, 'desc'=> description)
/*
$asSteps = $asImages = array();
$iLocalStepId = 1;
foreach($this->asSteps as $iStepId=>$sStepDesc)
foreach($this->asSteps as $iStepId=>$asStep)
{
$asSteps[$iLocalStepId] = $sStepDesc;
if(array_key_exists($iStepId, $this->asImages))
{
$asImages[] =
$this->asSteps[$iStepId]['formated_description'] = ToolBox::formatText($asStep['description']);
}
$iLocalStepId++;
}*/
return array( 'proc_id'=>$this->iProcId,
'id_user'=>$this->iUserId,
'title'=>Databap::getDescriptionFormat($this->sTitle),
'description'=>Databap::getDescriptionFormat($this->sDescription),
'led'=>Databap::getDateFormat($this->dLed),
'steps'=>$this->asSteps,
'images'=>$this->asImages);
'id_user'=>$this->iUserId,
'title'=>Databap::getDescriptionFormat($this->sTitle),
'description'=>Databap::getDescriptionFormat($this->sDescription),
'led'=>Databap::getDateFormat($this->dLed),
'steps'=>$this->asSteps,
'images'=>$this->asImages);
}
private function refreshProcId()

5
inc/toolbox.php
View File

@@ -265,6 +265,11 @@ class ToolBox
setcookie($sCookieName, $sCookieValue, $iTimeLimit);
}
public static function formatText($sText)
{
return str_replace("\n", '<br />', self::findReplaceLinks($sText));
}
//TODO implement link pattern
public static function findReplaceLinks($sText, $sLinkPattern='')
{