X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fpersons%2Fregister.php;h=db2b44f3fe7b9365284407c8c8455c7e2a98888a;hb=0c1ecf9af4db5be0942850b8a08cc53595dcb86e;hp=6232f77f9018d6294d34c15fa487e4513040653b;hpb=05411893eee11af861e93000f4064d9a6ea23455;p=plewww.git
diff --git a/planetlab/persons/register.php b/planetlab/persons/register.php
index 6232f77..db2b44f 100644
--- a/planetlab/persons/register.php
+++ b/planetlab/persons/register.php
@@ -67,9 +67,20 @@ Your E-mail address must be able to receive e-mail and will be
used as your $PLC_NAME username
EOF;
-$person_form['site_ids']['comment'] = <<< EOF
-Select the site where you belong
-EOF;
+
+// dirty hack feb 2018; if this file can be found,
+// its contents is used instead of the hard-wired message
+// it is searched along php's include path, so it should be
+// allright to save it as /etc/planetlab/php/person-registration.txt
+// of course html tags like and
are OK
+global $message_filename;
+$message_filename = "person-registration.txt";
+
+try {
+ $person_form['site_ids']['comment'] = file_get_contents($message_filename, TRUE);
+} catch (Exception $e) {
+ $person_form['site_ids']['comment'] = "Select the site where you belong";
+}
if (0)
$person_form['roles']['comment'] = <<< EOF
@@ -98,7 +109,7 @@ if (!empty($person['site_ids'])) {
function check_form ($person) {
global $person_form;
global $adm;
-
+
// Look for missing/blank entries
$missing = array();
foreach ($person_form as $name => $item) {
@@ -113,7 +124,7 @@ function check_form ($person) {
foreach ($missing as $field) $warnings []= "$field field is required.";
print html_div(plc_itemize($warnings),"messages error");
return FALSE;
- }
+ }
// check that the email address is not already used on this peer
$email=$person['email'];
@@ -133,7 +144,14 @@ function register_person ($person) {
$errors = errors_init ();
- // N.B.: site_ids and roles are ignored by AddPerson()
+ // jan-2013 with improvements in plcapi-5.1-6 about managing persons and tags,
+ // AddPerson has gone more picky and we need to remove some fields
+ // that no longer are silently ignored by AddPerson
+ $site_ids=$person['site_ids'];
+ unset ($person['site_ids']);
+ $roles=$person['roles'];
+ unset ($person['roles']);
+
$person_id = $adm->AddPerson($person);
$errors = errors_record ($adm,$errors);
@@ -141,15 +159,15 @@ function register_person ($person) {
$adm->begin();
// Add person to requested sites
- foreach ($person['site_ids'] as $site_id) {
+ foreach ($site_ids as $site_id) {
$adm->AddPersonToSite($person_id, intval($site_id));
$adm->SetPersonPrimarySite($person_id, intval($site_id));
}
- // Add requested roles. Always add the user role.
+ // Add requested roles. Always add the user role.
$adm->AddRoleToPerson('user', $person_id);
- if (!empty($person['roles'])) {
- foreach ($person['roles'] as $role) {
+ if (!empty($roles)) {
+ foreach ($roles as $role) {
$adm->AddRoleToPerson($role, $person_id);
}
}
@@ -217,8 +235,14 @@ $adm->begin();
// All defined sites
// cannot register with foreign site
-$adm->GetSites(array('is_public' => TRUE, 'peer_id' => NULL,'-SORT'=>'name'),
- array('site_id', 'name','enabled','peer_id'));
+// we also hide sites that are created by sfa
+// as well as the ones that have a disabled_registration tag set
+$adm->GetSites(array('is_public' => TRUE, 'peer_id' => NULL,
+ 'sfa_created' => NULL,
+ 'disabled_registration' => NULL,
+ '-SORT'=>'name'),
+ array('site_id', 'name', 'enabled', 'peer_id',
+ 'sfa_created', 'disabled_registration'));
// All defined roles
$adm->GetRoles();
@@ -246,7 +270,7 @@ function site_option($site) {
$option .= htmlspecialchars($site['name']);
# Safari/IE do not implement disabled correctly
if ( ! $site['enabled'] )
- $option .= " (pending registration)";
+ $option .= " (disabled, or pending registration)";
$option .= "";
return $option;
}