Merge branch 'master' of git+ssh://git.catalyst.net.nz/var/git/mahara

htdocs/admin/users/addtoinstitution.php

@@ -29,7 +29,6 @@ define('INSTITUTIONALADMIN', 1);
 require(dirname(dirname(dirname(__FILE__))) . '/init.php');
 require('institution.php');
 
-global $USER, $SESSION;
 $id          = param_integer('id');
 $institution = new Institution(param_alpha('institution'));
 

htdocs/admin/users/changeuser.php

@@ -27,8 +27,6 @@
 define('INTERNAL', 1);
 require(dirname(dirname(dirname(__FILE__))) . '/init.php');
 
-global $USER;
-
 if (param_integer('restore', 0)) {
     $id = $USER->restore_identity();
     redirect(get_config('wwwroot') . 'admin/users/edit.php?id=' . $id);

htdocs/admin/users/edit.php

@@ -37,7 +37,6 @@ $id = param_integer('id');
 $user = new User;
 $user->find_by_id($id);
 
-global $USER;
 if (!$USER->is_admin_for_user($user)) {
     redirect(get_config('wwwroot').'user/view.php?id='.$id);
 }

htdocs/admin/users/institutionadmins.php

@@ -34,14 +34,18 @@ define('SECTION_PLUGINTYPE', 'core');
 define('SECTION_PLUGINNAME', 'admin');
 define('SECTION_PAGE', 'adminusers');
 require_once('pieforms/pieform.php');
-global $USER;
-define('MENUITEM', ($USER->get('admin') ? 'configusers' : 'manageinstitutions') . '/institutionadmins');
+define('MENUITEM', 'manageinstitutions/institutionadmins');
 $smarty = smarty();
 
 require_once('institution.php');
 $institution = add_institution_selector_to_page(&$smarty, param_alphanum('institution', false), 
                                                 get_config('wwwroot') . 'admin/users/institutionadmins.php');
 
+if ($institution === false) {
+    $smarty->display('admin/users/noinstitutions.tpl');
+    exit;
+}
+
 // Get users who are currently admins
 $adminusers = get_column('usr_institution', 'usr', 'admin', 1, 'institution', $institution);
 

htdocs/admin/users/institutions.php

@@ -31,8 +31,7 @@ define('SECTION_PLUGINTYPE', 'core');
 define('SECTION_PLUGINNAME', 'admin');
 define('SECTION_PAGE', 'institutions');
 require_once('pieforms/pieform.php');
-global $USER;
-define('MENUITEM', ($USER->get('admin') ? 'configusers' : 'manageinstitutions') . '/institutions');
+define('MENUITEM', 'manageinstitutions/institutions');
 $smarty = smarty();
 
 $institution = param_variable('i', '');

htdocs/admin/users/institutionstaff.php

@@ -34,14 +34,18 @@ define('SECTION_PLUGINTYPE', 'core');
 define('SECTION_PLUGINNAME', 'admin');
 define('SECTION_PAGE', 'staffusers');
 require_once('pieforms/pieform.php');
-global $USER;
-define('MENUITEM', ($USER->get('admin') ? 'configusers' : 'manageinstitutions') . '/institutionstaff');
+define('MENUITEM', 'manageinstitutions/institutionstaff');
 $smarty = smarty();
 
 require_once('institution.php');
 $institution = add_institution_selector_to_page(&$smarty, param_alphanum('institution', false), 
                                                 get_config('wwwroot') . 'admin/users/institutionstaff.php');
 
+if ($institution === false) {
+    $smarty->display('admin/users/noinstitutions.tpl');
+    exit;
+}
+
 // Get users who are currently staff
 $staffusers = get_column('usr_institution', 'usr', 'staff', 1, 'institution', $institution);
 

htdocs/admin/users/institutionusers.php

@@ -33,11 +33,15 @@ define('TITLE', get_string('adminusers', 'admin'));
 define('SECTION_PLUGINTYPE', 'core');
 define('SECTION_PLUGINNAME', 'admin');
 define('SECTION_PAGE', 'institutionusers');
-define('MENUITEM', 'configusers/institutionusers');
+define('MENUITEM', 'manageinstitutions/institutionusers');
 require_once('pieforms/pieform.php');
 require_once('institution.php');
-global $USER;
 $institutionelement = get_institution_selector(false);
+$smarty = smarty();
+if (empty($institutionelement)) {
+    $smarty->display('admin/users/noinstitutions.tpl');
+    exit;
+}
 
 $institution = param_alphanum('institution', false);
 if (!$institution || !$USER->can_edit_institution($institution)) {
@@ -202,7 +206,6 @@ addLoadEvent(function() {
 });
 EOF;
 
-$smarty = smarty();
 $smarty->assign('INLINEJAVASCRIPT', $js);
 $smarty->assign('usertypeselector', $usertypeselector);
 $smarty->assign('institutionusersform', $userlistform);

htdocs/admin/users/uploadcsv.php

@@ -68,8 +68,6 @@ $ALLOWEDKEYS = array(
     'authinstance'
 );
 
-global $USER;
-
 if ($USER->get('admin')) {
     $authinstances = auth_get_auth_instances();
 } else {

htdocs/lang/en.utf8/admin.php

@@ -89,7 +89,9 @@ $string['uploadcsvdescription'] = 'Upload a CSV file containing new users';
 $string['usersearch'] = 'User Search';
 $string['usersearchdescription'] = 'Search all users and perform administrative actions on them';
 $string['usersearchinstructions'] = 'You can search for users by clicking on the initials of their first and last names, or by entering a name in the search box.  You can also enter an email address in the search box if you would like to search email addresses.';
-
+$string['institutionmembersdescription'] = 'Associate users with institutions';
+$string['institutionstaffdescription'] = 'Assign users Staff permissions';
+$string['institutionadminsdescription'] = 'Assign Institution Administrator access rights';
 $string['pluginadmin'] = 'Plugin Administration';
 $string['pluginadmindescription'] = 'Install and configure plugins';
 
@@ -362,6 +364,9 @@ $string['Maximum'] = 'Maximum';
 $string['Staff'] = 'Staff';
 $string['Admins'] = 'Admins';
 
+$string['noinstitutions'] = 'No Institutions';
+$string['noinstitutionsdescription'] = 'If you would like to associate users with an institution, you should create the institution first.';
+
 // Admin User Search
 $string['Query'] = 'Query';
 $string['Institution'] = 'Institution';

htdocs/lib/institution.php

@@ -415,28 +415,23 @@ function get_institution_selector($includedefault = true) {
         return null;
     }
 
-    if (count($institutions) > 1) {
-        $options = array();
-        foreach ($institutions as $i) {
-            $options[$i->name] = $i->displayname;
-        }
-        $institution = key($options);
-        $institutionelement = array(
-            'type' => 'select',
-            'title' => get_string('institution'),
-            'defaultvalue' => $institution,
-            'options' => $options,
-            'rules' => array('regex' => '/^[a-zA-Z0-9]+$/')
-        );
-    } else {
-        $institution = $institutions[0]->name;
-        $institutionelement = array(
-            'type' => 'hidden',
-            'value' => $institution,
-            'rules' => array('regex' => '/^[a-zA-Z0-9]+$/')
-        );
+    if (empty($institutions)) {
+        return null;
     }
 
+    $options = array();
+    foreach ($institutions as $i) {
+        $options[$i->name] = $i->displayname;
+    }
+    $institution = key($options);
+    $institutionelement = array(
+        'type' => 'select',
+        'title' => get_string('institution'),
+        'defaultvalue' => $institution,
+        'options' => $options,
+        'rules' => array('regex' => '/^[a-zA-Z0-9]+$/')
+    );
+
     return $institutionelement;
 }
 
@@ -448,6 +443,10 @@ function add_institution_selector_to_page($smarty, $institution, $page) {
     require_once('pieforms/pieform.php');
     $institutionelement = get_institution_selector(false);
 
+    if (empty($institutionelement)) {
+        return false;
+    }
+
     global $USER;
     if (empty($institution) || !$USER->can_edit_institution($institution)) {
         $institution = empty($institutionelement['value']) ? $institutionelement['defaultvalue'] : $institutionelement['value'];

htdocs/lib/web.php

@@ -1380,23 +1380,47 @@ function admin_nav() {
             'title'  => get_string('adminnotifications', 'admin'),
             'weight' => 40,
         ),
-        array(
-            'path'   => 'configusers/institutions',
-            'url'    => 'admin/users/institutions.php',
-            'title'  => get_string('institutions', 'admin'),
-            'weight' => 50,
-        ),
         array(
             'path'   => 'configusers/adduser',
             'url'    => 'admin/users/add.php',
             'title'  => get_string('adduser', 'admin'),
-            'weight' => 90,
+            'weight' => 50,
         ),
         array(
             'path'   => 'configusers/uploadcsv',
             'url'    => 'admin/users/uploadcsv.php',
             'title'  => get_string('uploadcsv', 'admin'),
-            'weight' => 100,
+            'weight' => 60,
+        ),
+        array(
+            'path'   => 'manageinstitutions',
+            'url'    => 'admin/users/institutions.php',
+            'title'  => get_string('manageinstitutions', 'admin'),
+            'weight' => 35,
+        ),
+        array(
+            'path'   => 'manageinstitutions/institutions',
+            'url'    => 'admin/users/institutions.php',
+            'title'  => get_string('institutions', 'admin'),
+            'weight' => 10,
+        ),
+        array(
+            'path'   => 'manageinstitutions/institutionusers',
+            'url'    => 'admin/users/institutionusers.php',
+            'title'  => get_string('institutionmembers', 'admin'),
+            'weight' => 20,
+        ),
+        array(
+            'path'   => 'manageinstitutions/institutionstaff',
+            'url'    => 'admin/users/institutionstaff.php',
+            'title'  => get_string('institutionstaff', 'admin'),
+            'weight' => 30,
+        ),
+        array(
+            'path'   => 'manageinstitutions/institutionadmins',
+            'url'    => 'admin/users/institutionadmins.php',
+            'title'  => get_string('institutionadmins', 'admin'),
+            'weight' => 40,
         ),
         array(
             'path'   => 'configextensions',
@@ -1441,23 +1465,17 @@ function institutional_admin_nav() {
             'title'  => get_string('suspendedusers', 'admin'),
             'weight' => 20,
         ),
-        array(
-            'path'   => 'configusers/institutionusers',
-            'url'    => 'admin/users/institutionusers.php',
-            'title'  => get_string('institutionmembers', 'admin'),
-            'weight' => 30,
-        ),
         array(
             'path'   => 'configusers/adduser',
             'url'    => 'admin/users/add.php',
             'title'  => get_string('adduser', 'admin'),
-            'weight' => 40,
+            'weight' => 30,
         ),
         array(
             'path'   => 'configusers/uploadcsv',
             'url'    => 'admin/users/uploadcsv.php',
             'title'  => get_string('uploadcsv', 'admin'),
-            'weight' => 50,
+            'weight' => 40,
         ),
         array(
             'path'   => 'manageinstitutions',
@@ -1471,23 +1489,29 @@ function institutional_admin_nav() {
             'title'  => get_string('institutionsettings', 'admin'),
             'weight' => 10,
         ),
+        array(
+            'path'   => 'manageinstitutions/institutionusers',
+            'url'    => 'admin/users/institutionusers.php',
+            'title'  => get_string('institutionmembers', 'admin'),
+            'weight' => 20,
+        ),
         array(
             'path'   => 'manageinstitutions/institutionstaff',
             'url'    => 'admin/users/institutionstaff.php',
-            'title'  => get_string('staffusers', 'admin'),
-            'weight' => 20,
+            'title'  => get_string('institutionstaff', 'admin'),
+            'weight' => 30,
         ),
         array(
             'path'   => 'manageinstitutions/institutionadmins',
             'url'    => 'admin/users/institutionadmins.php',
-            'title'  => get_string('adminusers', 'admin'),
-            'weight' => 30,
+            'title'  => get_string('institutionadmins', 'admin'),
+            'weight' => 40,
         ),
         array(
             'path'   => 'manageinstitutions/adminnotifications',
             'url'    => 'admin/users/notifications.php',
             'title'  => get_string('adminnotifications', 'admin'),
-            'weight' => 40,
+            'weight' => 50,
         ),
     );
 

htdocs/theme/default/templates/admin/index.tpl

@@ -43,11 +43,18 @@
         <li><strong><a href="{$WWWROOT}admin/users/staff.php">{str tag=sitestaff section=admin}</a></strong> - {str tag=staffusersdescription section=admin}</li>
         <li><strong><a href="{$WWWROOT}admin/users/admins.php">{str tag=siteadmins section=admin}</a></strong> - {str tag=adminusersdescription section=admin}</li>
         <li><strong><a href="{$WWWROOT}admin/users/notifications.php">{str tag=adminnotifications section=admin}</a></strong> - {str tag=adminnotificationsdescription section=admin}</li>
-        <li><strong><a href="{$WWWROOT}admin/users/institutions.php">{str tag=institutions section=admin}</a></strong> - {str tag=institutionsdescription section=admin}</li>
         <li><strong><a href="{$WWWROOT}admin/users/add.php">{str tag=adduser section=admin}</a></strong> - {str tag=adduserdescription section=admin}</li>
         <li><strong><a href="{$WWWROOT}admin/users/uploadcsv.php">{str tag=uploadcsv section=admin}</a></strong> - {str tag=uploadcsvdescription section=admin}</li>
     </ul>
     </li>
+    <li><h3>{str tag=manageinstitutions section=admin}</h3>
+    <ul>
+        <li><strong><a href="{$WWWROOT}admin/users/institutions.php">{str tag=institutions section=admin}</a></strong> - {str tag=institutionsdescription section=admin}</li>
+        <li><strong><a href="{$WWWROOT}admin/users/institutionusers.php">{str tag=institutionmembers section=admin}</a></strong> - {str tag=institutionmembersdescription section=admin}</li>
+        <li><strong><a href="{$WWWROOT}admin/users/institutionstaff.php">{str tag=institutionstaff section=admin}</a></strong> - {str tag=institutionstaffdescription section=admin}</li>
+        <li><strong><a href="{$WWWROOT}admin/users/institutionadmins.php">{str tag=institutionadmins section=admin}</a></strong> - {str tag=institutionadminsdescription section=admin}</li>
+    </ul>
+    </li>
     <li><h3>{str tag=configextensions section=admin}</h3>
     <ul>
         <li><strong><a href="{$WWWROOT}admin/extensions/plugins.php">{str tag=pluginadmin section=admin}</a></strong> - {str tag=pluginadmindescription section=admin}</li>

htdocs/theme/default/templates/admin/users/noinstitutions.tpl

+{include file="header.tpl"}
+
+{include file="columnfullstart.tpl"}
+	
+<h2>{str tag="noinstitutions" section="admin"}</h2>
+<p>{str tag="noinstitutionsdescription" section="admin"}</p>
+<div class="institutioneditbuttons">
+<form action="{$WWWROOT}admin/users/institutions.php" method="post">
+    <input type="submit" class="submit" name="add" value="{str tag="addinstitution" section="admin"}" id="admininstitution_add">
+</form>
+</div>
+
+{include file="columnfullend.tpl"}
+
+{include file="footer.tpl"}