[evolvis-commits] r17779: utils_crossref.php disturbed me on tab completion, so nuke it
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Dec 6 20:26:24 CET 2011
Author: mirabilos
Date: 2011-12-06 20:26:24 +0100 (Tue, 06 Dec 2011)
New Revision: 17779
Removed:
trunk/gforge_base/evolvisforge-5.1/src/common/include/utils_crossref.php
Modified:
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeFactoryHtml.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
Log:
utils_crossref.php disturbed me on tab completion, so nuke it
and get rid of the remaining schizophrenia here
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php 2011-12-06 19:26:19 UTC (rev 17778)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php 2011-12-06 19:26:24 UTC (rev 17779)
@@ -700,7 +700,17 @@
// Now display extra-fields (fields are numbers).
$value = $extra_data[$f]['value'];
if ($extra_data[$f]['type'] == 9) {
- $value = preg_replace('/\b(\d+)\b/e', "_artifactid2url('\\1')", $value);
+ $r = "";
+ foreach (preg_split("/\D+/", $value) as $v) {
+ $v = (int)$v;
+ if (!$v) {
+ continue;
+ }
+ $r .= html_e('a', array(
+ 'href' => util_make_url('/tracker/t_follow.php/' . $v),
+ ), sprintf('[#%d]', $v)) . "\n";
+ }
+ $value = $r;
} else if ($extra_data[$f]['type'] == 7) {
if ($art_arr[$i]->getStatusID() == 2) {
$value = '<strike>'.$value.'</strike>';
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php 2011-12-06 19:26:19 UTC (rev 17778)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php 2011-12-06 19:26:24 UTC (rev 17779)
@@ -12,7 +12,6 @@
require_once $gfcommon.'tracker/Artifact.class.php';
-require_once $gfcommon.'include/utils_crossref.php';
require_once $gfcommon.'include/EvolvisTable.class.php';
class ArtifactHtml extends Artifact {
@@ -34,10 +33,23 @@
* show details preformatted (like followups)
*/
function showDetails($editable = false) {
+ global $group_id;
+
$result = $this->getDetails();
- $result = util_gen_cross_ref($result, $this->ArtifactType->Group->getID());
- //$result = util_line_wrap( $result, 120,"\n");
- $result = preg_replace('/\r|\n/', '<br />', $result);
+ if (isset($group_id)) {
+ $sgid = $group_id;
+ $sgidx = true;
+ } else {
+ $sgidx = false;
+ }
+ $group_id = $this->ArtifactType->Group->getID();
+ $result = util_uri_grabber($result, true);
+ if ($sgidx) {
+ $group_id = $sgid;
+ } else {
+ unset($group_id);
+ }
+ $result = "<pre style=\"font-size:small;\">\n" . $result . "</pre>\n";
$title_arr = array();
if ($editable === true) {
@@ -82,23 +94,10 @@
echo util_make_link_u (db_result($result,$i,'user_name'),db_result($result,$i,'user_id'),db_result($result,$i,'realname'));
}
- echo "</tt><pre>\n" .
+ echo "</tt><pre style=\"font-size:small;\">\n" .
util_uri_grabber(html_entity_decode(db_result($result,
$i, 'body'), ENT_QUOTES, "UTF-8"), true) .
"</pre></td></tr>\n";
-
-// Evolvis 4.8
-// echo "</tt>" .
-// util_ttwrap(util_uri_grabber(html_entity_decode(db_result($result,
-// $i, 'body'), ENT_QUOTES, "UTF-8"), true)) .
-// "</td></tr>\n";
-
-// FF 5.1
-// $text = db_result($result, $i, 'body');
-// $text = util_gen_cross_ref($text, $this->ArtifactType->Group->getID());
-// //$text = util_line_wrap( $text, 120,"\n");
-// $text = preg_replace('/\r?\n/', '<br />', $text);
-// echo "</tt>"; echo "<br /><br />".$text.'</td></tr>';
}
echo $GLOBALS['HTML']->listTableBottom();
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeFactoryHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeFactoryHtml.class.php 2011-12-06 19:26:19 UTC (rev 17778)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeFactoryHtml.class.php 2011-12-06 19:26:24 UTC (rev 17779)
@@ -25,7 +25,6 @@
require_once $gfcommon.'tracker/ArtifactExtraField.class.php';
require_once $gfcommon.'tracker/ArtifactExtraFieldElement.class.php';
require_once $gfcommon.'tracker/ArtifactWorkflow.class.php';
-require_once $gfcommon.'include/utils_crossref.php';
class ArtifactTypeFactoryHtml extends ArtifactTypeFactory {
function header($params=array()) {
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php 2011-12-06 19:26:19 UTC (rev 17778)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php 2011-12-06 19:26:24 UTC (rev 17779)
@@ -27,7 +27,6 @@
require_once $gfcommon.'tracker/ArtifactExtraField.class.php';
require_once $gfcommon.'tracker/ArtifactExtraFieldElement.class.php';
require_once $gfcommon.'tracker/ArtifactWorkflow.class.php';
-require_once $gfcommon.'include/utils_crossref.php';
require_once $gfcommon.'include/EvolvisTable.class.php';
class ArtifactTypeHtml extends ArtifactType {
@@ -151,7 +150,17 @@
"<a href=\"\\1\" target=\"_blank\">\\1</a>", $value);
} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
// Convert artifact id to links.
- $value = preg_replace('/\b(\d+)\b/e', "_artifactid2url('\\1')", $value);
+ $r = "";
+ foreach (preg_split("/\D+/", $value) as $v) {
+ $v = (int)$v;
+ if (!$v) {
+ continue;
+ }
+ $r .= html_e('a', array(
+ 'href' => util_make_url('/tracker/t_follow.php/' . $v),
+ ), sprintf('[#%d]', $v)) . "\n";
+ }
+ $value = $r;
}
$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',"",$template);
$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$value,$template);
@@ -297,7 +306,17 @@
"<a href=\"\\1\" target=\"_blank\">\\1</a>", $value);
} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
// Convert artifact id to links.
- $value = preg_replace('/\b(\d+)\b/e', "_artifactid2url('\\1')", $value);
+ $r = "";
+ foreach (preg_split("/\D+/", $value) as $v) {
+ $v = (int)$v;
+ if (!$v) {
+ continue;
+ }
+ $r .= html_e('a', array(
+ 'href' => util_make_url('/tracker/t_follow.php/' . $v),
+ ), sprintf('[#%d]', $v)) . "\n";
+ }
+ $value = $r;
}
$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',"",$template);
$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$value,$template);
@@ -770,7 +789,33 @@
$vals[$i]=$arr[$i]['element_name'];
}
// Convert artifact id to links.
- $html_contents = preg_replace('/\b(\d+)\b/e', "_artifactid2url('\\1','title')", $contents);
+ $html_contents = "";
+ foreach (preg_split("/\D+/", $contents) as $v) {
+ $v = (int)$v;
+ if (!$v) {
+ continue;
+ }
+ $res = db_query_params('SELECT summary, status_id
+ FROM artifact
+ WHERE artifact_id=$1',
+ array(
+ $v,
+ ));
+ if (db_numrows($res) != 1) {
+ $html_contents .= sprintf(
+ _('[#%d] (unknown)'), $v) . "<br />\n";
+ continue;
+ }
+ $row = db_fetch_array($res);
+ $ts = array();
+ if ($row['status_id'] == 2) {
+ $ts['class'][] = 'artifact_closed';
+ }
+ $html_contents .= html_e('tt', $ts, sprintf('[#%d]',
+ $v)) . " " . html_e('a', array(
+ 'href' => util_make_url('/tracker/t_follow.php/' . $v),
+ ), util_html_secure($row['summary'])) . html_e('br');
+ }
$edit_contents = $this->renderTextField ($extra_field_id,$contents,$size,$maxlength);
$edit_tips = '<br/><span class="tips">'._('Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)').'</span>';
return '
More information about the evolvis-commits
mailing list