[evolvis-commits] r17297: XHTML and PHP fixes
mirabilos at evolvis.org
mirabilos at evolvis.org
Fri Jun 10 16:24:34 CEST 2011
Author: mirabilos
Date: 2011-06-10 16:24:34 +0200 (Fri, 10 Jun 2011)
New Revision: 17297
Modified:
trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactExtraField.class.php
trunk/gforge_base/evolvisforge/gforge/www/tracker/admin/form-updateextrafield.php
trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
Log:
XHTML and PHP fixes
Modified: trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactExtraField.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactExtraField.class.php 2011-06-10 14:15:38 UTC (rev 17296)
+++ trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactExtraField.class.php 2011-06-10 14:24:34 UTC (rev 17297)
@@ -285,7 +285,7 @@
* @return string type.
*/
function getTypeName() {
- $arr=&$this->getAvailableTypes();
+ $arr = $this->getAvailableTypes();
return $arr[$this->data_array['field_type']];
}
Modified: trunk/gforge_base/evolvisforge/gforge/www/tracker/admin/form-updateextrafield.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/tracker/admin/form-updateextrafield.php 2011-06-10 14:15:38 UTC (rev 17296)
+++ trunk/gforge_base/evolvisforge/gforge/www/tracker/admin/form-updateextrafield.php 2011-06-10 14:24:34 UTC (rev 17297)
@@ -18,10 +18,9 @@
$feedback .= $ac->getErrorMessage();
} else {
?>
- <p>
<strong><?php echo _('Type of custom field').': '.$ac->getTypeName(); ?></strong><br />
- <form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&id='.$id.'&atid='.$ath->getID(); ?>" method="post">
+ <form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&id='.$id.'&atid='.$ath->getID(); ?>" method="post">
<input type="hidden" name="update_box" value="y" />
<input type="hidden" name="id" value="<?php echo $ac->getID(); ?>" />
<input type="hidden" name="is_required" value="0" />
@@ -31,23 +30,22 @@
<p>
<?php if ($ac->getType() == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA || $ac->getType() == ARTIFACT_EXTRAFIELDTYPE_TEXT) {?>
<?php echo _('Text Fields and Text Areas need to have Size/Maxlength and Rows/Cols defined, respectively.'); ?><br />
- <?php echo _('Text Field Size/Text Area Rows'); ?> <input type="text" name="attribute1" value="<?php echo $ac->getAttribute1(); ?>" size="2" maxlength="2"><br />
- <?php echo _('Text Field Maxlength/Text Area Columns'); ?> <input type="text" name="attribute2" value="<?php echo $ac->getAttribute2(); ?>" size="2" maxlength="2">
+ <?php echo _('Text Field Size/Text Area Rows'); ?> <input type="text" name="attribute1" value="<?php echo $ac->getAttribute1(); ?>" size="2" maxlength="2" /><br />
+ <?php echo _('Text Field Maxlength/Text Area Columns'); ?> <input type="text" name="attribute2" value="<?php echo $ac->getAttribute2(); ?>" size="2" maxlength="2" />
<br />
<?php } else { ?>
<input type="hidden" name="attribute1" value="0" />
<input type="hidden" name="attribute2" value="0" />
<?php } ?>
- <p>
+ </p><p>
<strong><?php echo _('Field alias') ?>:</strong><br />
<input type="text" name="alias" value="<?php echo $ac->getAlias(); ?>" /></p>
- </p>
<p>
<span class="warning"><?php echo _('It is not recommended that you change the custom field name because other things are dependent upon it. When you change the custom field name, all related items will be changed to the new name') ?>
</span></p>
<p>
<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" /></p>
- </form></p>
+ </form>
<?php
}
Modified: trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php 2011-06-10 14:15:38 UTC (rev 17296)
+++ trunk/gforge_base/evolvisforge/gforge/www/tracker/browse.php 2011-06-10 14:24:34 UTC (rev 17297)
@@ -117,8 +117,11 @@
}
$i++;
}
-$creators_c_arr = array_combine($creators_id_arr, $creators_name_arr);
-natcasesort($creators_c_arr);
+$creators_c_arr = array();
+if (count($creators_id_arr) > 0) {
+ $creators_c_arr = array_combine($creators_id_arr, $creators_name_arr);
+ natcasesort($creators_c_arr);
+}
$offset = getStringFromRequest('offset');
$max_rows = getStringFromRequest('max_rows', 25);
More information about the evolvis-commits
mailing list