//
// Build an associative array of these key values + localized description
//
- $role_vals[$section][$this->role_values[$section][$i]]=$rbac_permission_names["$section".$this->role_values[$section][$i]];
+ $role_vals[$section][$this->role_values[$section][$i]] =
+ util_ifsetor($rbac_permission_names["$section".$this->role_values[$section][$i]],
+ _('UNKNOWN (internal error, report bug to FusionForge)'));
}
}
return $role_vals[$section];
return false;
}
- foreach ($group->getUsers() as $u) {
+ foreach ($group->getUsers(false) as $u) {
$this->sysGroupAddUser ($group_id, $u->getID()) ;
}
return ($ashtml ? util_html_encode($rv) : $rv);
}
+/**
+ * util_sanitise_multiline_submission() – Convert text to ASCII CR-LF
+ *
+ * @param string $text
+ * input string to sanitise
+ * @return string
+ * sanitised string: CR, LF or CR-LF converted to CR-LF
+ */
+function util_sanitise_multiline_submission($text) {
+ /* convert all CR-LF into LF */
+ $text = preg_replace("/\015+\012+/m", "\012", $text);
+ /* convert all CR or LF into CR-LF */
+ $text = preg_replace("/[\012\015]/m", "\015\012", $text);
+
+ return $text;
+}
+
+
// Local Variables:
// mode: php
// c-file-style: "bsd"
esac
msg green " * Loading FusionForge DB"
- su $susufix $gforge_user -c "psql $gforge_db < $fusionforge_src_dir/db/gforge.sql" >> /tmp/gforge-import.log
+ su $susufix $gforge_user -c "psql $gforge_db < $fusionforge_src_dir/db/gforge.sql" >> /tmp/gforge-import.log 2>&1
msg green " * Running php db/upgrade-db.php"
if ! php $fusionforge_src_dir/db/upgrade-db.php >> /tmp/gforge-upgrade.log ; then
return 1
fi
-
if [ -z "$FFORGE_ADMIN_USER" ]
then
while test -z "$FFORGE_ADMIN_USER"