Commit 21d5712f authored by Aaron Wells's avatar Aaron Wells

Removing end-of-line whitespace

As vetted in the May 2014 dev meeting
http://meetbot.mahara.org/mahara-dev/2014/mahara-dev.2014-05-01-08.01.log.html

Change-Id: I353ed74d69a5346fbe4e8e521e5c349dbe8dcbac
parent e46afb22
...@@ -69,7 +69,7 @@ function markread(form, action) { ...@@ -69,7 +69,7 @@ function markread(form, action) {
var e = getElementsByTagAndClassName(null,'tocheck'+action,form); var e = getElementsByTagAndClassName(null,'tocheck'+action,form);
var pd = {}; var pd = {};
for (cb in e) { for (cb in e) {
if (e[cb].checked == true) { if (e[cb].checked == true) {
pd[e[cb].name] = 1; pd[e[cb].name] = 1;
...@@ -92,7 +92,7 @@ function markread(form, action) { ...@@ -92,7 +92,7 @@ function markread(form, action) {
pd[p] = paginatorData.params[p]; pd[p] = paginatorData.params[p];
} }
} }
sendjsonrequest('index.json.php', pd, 'GET', function (data) { sendjsonrequest('index.json.php', pd, 'GET', function (data) {
paginator.updateResults(data); paginator.updateResults(data);
updateUnreadCount(data); updateUnreadCount(data);
......
...@@ -190,7 +190,7 @@ function accountprefs_submit(Pieform $form, $values) { ...@@ -190,7 +190,7 @@ function accountprefs_submit(Pieform $form, $values) {
} }
// use this as looping through values is not safe. // use this as looping through values is not safe.
$expectedprefs = expected_account_preferences(); $expectedprefs = expected_account_preferences();
if ($values['maildisabled'] == 0 && get_account_preference($USER->get('id'), 'maildisabled') == 1) { if ($values['maildisabled'] == 0 && get_account_preference($USER->get('id'), 'maildisabled') == 1) {
// Reset the sent and bounce counts otherwise mail will be disabled // Reset the sent and bounce counts otherwise mail will be disabled
// on the next send attempt // on the next send attempt
......
...@@ -73,7 +73,7 @@ function leaveinstitution_submit(Pieform $form, $values) { ...@@ -73,7 +73,7 @@ function leaveinstitution_submit(Pieform $form, $values) {
// List all institutions the user has requested membership, with a // List all institutions the user has requested membership, with a
// cancel request button // cancel request button
$requested = get_column('usr_institution_request', 'institution', $requested = get_column('usr_institution_request', 'institution',
'usr', $USER->id, 'confirmedusr', 1); 'usr', $USER->id, 'confirmedusr', 1);
if (!empty($requested)) { if (!empty($requested)) {
$elements = array(); $elements = array();
...@@ -81,7 +81,7 @@ if (!empty($requested)) { ...@@ -81,7 +81,7 @@ if (!empty($requested)) {
$elements[] = array( $elements[] = array(
'type' => 'submit', 'type' => 'submit',
'name' => '_cancelrequest_' . $i, 'name' => '_cancelrequest_' . $i,
'title' => get_string('youhaverequestedmembershipof', 'mahara', 'title' => get_string('youhaverequestedmembershipof', 'mahara',
$institutions[$i]->displayname), $institutions[$i]->displayname),
'value' => get_string('cancelrequest') 'value' => get_string('cancelrequest')
); );
...@@ -124,7 +124,7 @@ if (!empty($invited)) { ...@@ -124,7 +124,7 @@ if (!empty($invited)) {
$elements[] = array( $elements[] = array(
'type' => 'submit', 'type' => 'submit',
'name' => '_confirminvite_' . $i, 'name' => '_confirminvite_' . $i,
'title' => get_string('youhavebeeninvitedtojoin', 'mahara', 'title' => get_string('youhavebeeninvitedtojoin', 'mahara',
$institutions[$i]->displayname), $institutions[$i]->displayname),
'value' => get_string('joininstitution') 'value' => get_string('joininstitution')
); );
......
...@@ -62,12 +62,12 @@ foreach (array_keys($plugins) as $plugin) { ...@@ -62,12 +62,12 @@ foreach (array_keys($plugins) as $plugin) {
$plugins[$plugin]['installed'][$key]['types'][$collapseto] = true; $plugins[$plugin]['installed'][$key]['types'][$collapseto] = true;
} }
else { else {
$plugins[$plugin]['installed'][$key]['types'][$t] = $plugins[$plugin]['installed'][$key]['types'][$t] =
call_static_method($classname, 'has_config'); call_static_method($classname, 'has_config');
} }
} }
} }
} }
else { else {
$classname = generate_class_name($plugin, $i->name); $classname = generate_class_name($plugin, $i->name);
safe_require($plugin, $key); safe_require($plugin, $key);
...@@ -77,7 +77,7 @@ foreach (array_keys($plugins) as $plugin) { ...@@ -77,7 +77,7 @@ foreach (array_keys($plugins) as $plugin) {
} }
} }
} }
$dirhandle = opendir(get_config('docroot') . $plugin); $dirhandle = opendir(get_config('docroot') . $plugin);
while (false !== ($dir = readdir($dirhandle))) { while (false !== ($dir = readdir($dirhandle))) {
$installed = false; // reinitialise $installed = false; // reinitialise
...@@ -125,7 +125,7 @@ foreach (array_keys($plugins) as $plugin) { ...@@ -125,7 +125,7 @@ foreach (array_keys($plugins) as $plugin) {
if (!array_key_exists($dir, $plugins['artefact']['installed'])) { if (!array_key_exists($dir, $plugins['artefact']['installed'])) {
throw new InstallationException(get_string('blocktypeprovidedbyartefactnotinstallable', 'error', $dir)); throw new InstallationException(get_string('blocktypeprovidedbyartefactnotinstallable', 'error', $dir));
} }
validate_plugin('blocktype', $dir . '/' . $btdir, validate_plugin('blocktype', $dir . '/' . $btdir,
get_config('docroot') . 'artefact/' . $dir . '/blocktype/' . $btdir); get_config('docroot') . 'artefact/' . $dir . '/blocktype/' . $btdir);
$plugins['blocktype']['notinstalled'][$dir . '/' . $btdir] = array(); $plugins['blocktype']['notinstalled'][$dir . '/' . $btdir] = array();
} }
...@@ -158,7 +158,7 @@ function installplugin(name) { ...@@ -158,7 +158,7 @@ function installplugin(name) {
var message = {$successstring} + data.newversion; var message = {$successstring} + data.newversion;
$(name + '.message').innerHTML = '<img src="{$successicon}" alt=":)" /> ' + message; $(name + '.message').innerHTML = '<img src="{$successicon}" alt=":)" /> ' + message;
$(name + '.install').innerHTML = ''; $(name + '.install').innerHTML = '';
// move the whole thing into the list of installed plugins // move the whole thing into the list of installed plugins
// new parent node // new parent node
var bits = name.split('\.'); var bits = name.split('\.');
var newparent = $(bits[0] + '.installed'); var newparent = $(bits[0] + '.installed');
...@@ -173,7 +173,7 @@ function installplugin(name) { ...@@ -173,7 +173,7 @@ function installplugin(name) {
var message = ''; var message = '';
if (data.errormessage) { if (data.errormessage) {
message = data.errormessage; message = data.errormessage;
} }
else { else {
message = {$failurestring}; message = {$failurestring};
} }
......
...@@ -37,8 +37,8 @@ if ($menuitems) { ...@@ -37,8 +37,8 @@ if ($menuitems) {
$safeurl = sanitize_url($i->url); $safeurl = sanitize_url($i->url);
if (empty($i->url) && !empty($i->file)) { if (empty($i->url) && !empty($i->file)) {
$r['type'] = 'sitefile'; $r['type'] = 'sitefile';
$r['linkedto'] = get_config('wwwroot') . 'artefact/file/download.php?file=' . $i->file; $r['linkedto'] = get_config('wwwroot') . 'artefact/file/download.php?file=' . $i->file;
$r['linktext'] = $i->filename; $r['linktext'] = $i->filename;
$r['file'] = $i->file; $r['file'] = $i->file;
} }
else if ($safeurl == '') { else if ($safeurl == '') {
......
...@@ -46,8 +46,8 @@ function getitems() { ...@@ -46,8 +46,8 @@ function getitems() {
} }
// Get a list of the available admin files // Get a list of the available admin files
function getadminfiles() { function getadminfiles() {
sendjsonrequest('getadminfiles.json.php', {'public':selectedmenu == 'loggedoutmenu'}, sendjsonrequest('getadminfiles.json.php', {'public':selectedmenu == 'loggedoutmenu'},
'GET', 'GET',
function (data) { function (data) {
if (!data.error) { if (!data.error) {
adminfiles = data.adminfiles; adminfiles = data.adminfiles;
......
...@@ -30,7 +30,7 @@ raise_time_limit(120); ...@@ -30,7 +30,7 @@ raise_time_limit(120);
raise_memory_limit('256M'); raise_memory_limit('256M');
$data = array( $data = array(
'key' => $name 'key' => $name
); );
if ($install) { if ($install) {
if (!get_config('installed')) { if (!get_config('installed')) {
if ($name == 'localpreinst' || $name == 'localpostinst') { if ($name == 'localpreinst' || $name == 'localpostinst') {
...@@ -75,7 +75,7 @@ if (!empty($upgrade)) { ...@@ -75,7 +75,7 @@ if (!empty($upgrade)) {
$data['newversion'] = $upgrade->torelease . ' (' . $upgrade->to . ')' ; $data['newversion'] = $upgrade->torelease . ' (' . $upgrade->to . ')' ;
if ($name == 'core') { if ($name == 'core') {
$funname = 'upgrade_core'; $funname = 'upgrade_core';
} }
else if ($name == 'local') { else if ($name == 'local') {
$funname = 'upgrade_local'; $funname = 'upgrade_local';
} }
...@@ -99,7 +99,7 @@ if (!empty($upgrade)) { ...@@ -99,7 +99,7 @@ if (!empty($upgrade)) {
} }
json_reply(false, $data); json_reply(false, $data);
exit; exit;
} }
catch (Exception $e) { catch (Exception $e) {
list($texttrace, $htmltrace) = log_build_backtrace($e->getTrace()); list($texttrace, $htmltrace) = log_build_backtrace($e->getTrace());
$data['errormessage'] = $e->getMessage() . '<br>' . $htmltrace; $data['errormessage'] = $e->getMessage() . '<br>' . $htmltrace;
......
...@@ -128,7 +128,7 @@ if (!empty($upgrades['core']->install)) { ...@@ -128,7 +128,7 @@ if (!empty($upgrades['core']->install)) {
$upgrades['lastcoredata'] = true; $upgrades['lastcoredata'] = true;
$upgrades['localpostinst'] = true; $upgrades['localpostinst'] = true;
$smarty->assign('install', true); $smarty->assign('install', true);
} }
$js = <<< EOJS $js = <<< EOJS
function processNext() { function processNext() {
...@@ -183,13 +183,13 @@ $js = <<< EOJS ...@@ -183,13 +183,13 @@ $js = <<< EOJS
var message = ''; var message = '';
if (data.errormessage) { if (data.errormessage) {
message = data.errormessage; message = data.errormessage;
} }
else { else {
message = {$failurestring}; message = {$failurestring};
} }
$(data.key).innerHTML = '<img src="{$failureicon}" alt=":(" /> ' + message; $(data.key).innerHTML = '<img src="{$failureicon}" alt=":(" /> ' + message;
} }
}, },
function () { function () {
$(element).innerHTML = '<img src="{$failureicon}" alt=":(" /> ' + {$failurestring}; $(element).innerHTML = '<img src="{$failureicon}" alt=":(" /> ' + {$failurestring};
}, },
......
...@@ -53,7 +53,7 @@ $form = pieform(array( ...@@ -53,7 +53,7 @@ $form = pieform(array(
function adminusers_submit(Pieform $form, $values) { function adminusers_submit(Pieform $form, $values) {
global $SESSION; global $SESSION;
db_begin(); db_begin();
execute_sql('UPDATE {usr} execute_sql('UPDATE {usr}
SET admin = 0 SET admin = 0
......
...@@ -53,7 +53,7 @@ function export_iframe_die($message) { ...@@ -53,7 +53,7 @@ function export_iframe_die($message) {
} }
/** /**
* Registered as the progress report handler for the export. Streams updates * Registered as the progress report handler for the export. Streams updates
* back to the browser * back to the browser
* *
* @param int $percent How far complete the export is * @param int $percent How far complete the export is
...@@ -204,8 +204,8 @@ if (!empty($exporterrors)) { ...@@ -204,8 +204,8 @@ if (!empty($exporterrors)) {
$SESSION->add_error_msg(get_string('couldnotexportusers', 'admin', implode(', ', $exporterrors))); $SESSION->add_error_msg(get_string('couldnotexportusers', 'admin', implode(', ', $exporterrors)));
} }
// Store the filename in the session, and redirect the iframe to it to trigger // Store the filename in the session, and redirect the iframe to it to trigger
// the download. Here it would be nice to trigger the download for everyone, // the download. Here it would be nice to trigger the download for everyone,
// but alas this is not possible for people without javascript. // but alas this is not possible for people without javascript.
$SESSION->set('exportfile', $zipfile); $SESSION->set('exportfile', $zipfile);
$continueurljs = get_config('wwwroot'); $continueurljs = get_config('wwwroot');
......
...@@ -674,8 +674,8 @@ function institution_submit(Pieform $form, $values) { ...@@ -674,8 +674,8 @@ function institution_submit(Pieform $form, $values) {
$newinstitution->showonlineusers = !isset($values['showonlineusers']) ? 2 : $values['showonlineusers']; $newinstitution->showonlineusers = !isset($values['showonlineusers']) ? 2 : $values['showonlineusers'];
if (get_config('usersuniquebyusername')) { if (get_config('usersuniquebyusername')) {
// Registering absolutely not allowed when this setting is on, it's a // Registering absolutely not allowed when this setting is on, it's a
// security risk. See the documentation for the usersuniquebyusername // security risk. See the documentation for the usersuniquebyusername
// setting for more information // setting for more information
$newinstitution->registerallowed = 0; $newinstitution->registerallowed = 0;
} }
...@@ -899,8 +899,8 @@ function institution_submit(Pieform $form, $values) { ...@@ -899,8 +899,8 @@ function institution_submit(Pieform $form, $values) {
if ($add) { if ($add) {
if (!$newinstitution->registerallowed) { if (!$newinstitution->registerallowed) {
// If registration is not allowed, then an authinstance will not // If registration is not allowed, then an authinstance will not
// have been created, and thus cause the institution page to add // have been created, and thus cause the institution page to add
// its own error message on the next page load // its own error message on the next page load
$SESSION->add_ok_msg(get_string('institutionaddedsuccessfully2', 'admin')); $SESSION->add_ok_msg(get_string('institutionaddedsuccessfully2', 'admin'));
} }
......
...@@ -47,7 +47,7 @@ $form = array( ...@@ -47,7 +47,7 @@ $form = array(
'defaultvalue' => $staffusers, 'defaultvalue' => $staffusers,
'lefttitle' => get_string('institutionmembers', 'admin'), 'lefttitle' => get_string('institutionmembers', 'admin'),
'righttitle' => get_string('institutionstaff', 'admin'), 'righttitle' => get_string('institutionstaff', 'admin'),
'searchparams' => array('limit' => 100, 'query' => '', 'member' => 1, 'searchparams' => array('limit' => 100, 'query' => '', 'member' => 1,
'institution' => $institution), 'institution' => $institution),
'searchscript' => 'admin/users/userinstitutionsearch.json.php', 'searchscript' => 'admin/users/userinstitutionsearch.json.php',
), ),
......
...@@ -23,10 +23,10 @@ $sql = ' ...@@ -23,10 +23,10 @@ $sql = '
SELECT SELECT
u.id, u.username, u.firstname, u.lastname, u.preferredname, u.admin, u.staff, u.profileicon, u.email, u.id, u.username, u.firstname, u.lastname, u.preferredname, u.admin, u.staff, u.profileicon, u.email,
a.activity, a.method a.activity, a.method
FROM {usr} u FROM {usr} u
LEFT JOIN {usr_activity_preference} a ON a.usr = u.id LEFT JOIN {usr_activity_preference} a ON a.usr = u.id
LEFT OUTER JOIN {usr_institution} ui LEFT OUTER JOIN {usr_institution} ui
ON (ui.usr = u.id' . ($USER->get('admin') ? '' : ' AND ui.institution IN (' ON (ui.usr = u.id' . ($USER->get('admin') ? '' : ' AND ui.institution IN ('
. join(',',array_map('db_quote', array_keys($USER->get('institutions')))) . ')') . ') . join(',',array_map('db_quote', array_keys($USER->get('institutions')))) . ')') . ')
WHERE u.deleted = 0 WHERE u.deleted = 0
GROUP BY GROUP BY
......
...@@ -49,7 +49,7 @@ $form = pieform(array( ...@@ -49,7 +49,7 @@ $form = pieform(array(
function staffusers_submit(Pieform $form, $values) { function staffusers_submit(Pieform $form, $values) {
global $SESSION; global $SESSION;
db_begin(); db_begin();
execute_sql('UPDATE {usr} execute_sql('UPDATE {usr}
SET staff = 0 SET staff = 0
......
...@@ -21,7 +21,7 @@ $offset = param_integer('offset', 0); ...@@ -21,7 +21,7 @@ $offset = param_integer('offset', 0);
$type = param_alpha('type', 'suspended'); $type = param_alpha('type', 'suspended');
// Filter for institutional admins: // Filter for institutional admins:
$instsql = $USER->get('admin') ? '' : ' $instsql = $USER->get('admin') ? '' : '
AND ui.institution IN (' . join(',', array_map('db_quote', array_keys($USER->get('institutions')))) . ')'; AND ui.institution IN (' . join(',', array_map('db_quote', array_keys($USER->get('institutions')))) . ')';
$count = get_field_sql(' $count = get_field_sql('
...@@ -36,7 +36,7 @@ $count = get_field_sql(' ...@@ -36,7 +36,7 @@ $count = get_field_sql('
) AS a'); ) AS a');
$data = get_records_sql_assoc(' $data = get_records_sql_assoc('
SELECT SELECT
u.id, u.firstname, u.lastname, u.studentid, u.suspendedctime, u.suspendedreason AS reason, u.id, u.firstname, u.lastname, u.studentid, u.suspendedctime, u.suspendedreason AS reason,
ua.firstname AS cusrfirstname, ua.lastname AS cusrlastname, ' . db_format_tsfield('u.expiry', 'expiry') . ' ua.firstname AS cusrfirstname, ua.lastname AS cusrlastname, ' . db_format_tsfield('u.expiry', 'expiry') . '
FROM {usr} u FROM {usr} u
......
...@@ -468,7 +468,7 @@ function uploadcsv_submit(Pieform $form, $values) { ...@@ -468,7 +468,7 @@ function uploadcsv_submit(Pieform $form, $values) {
$institution = new Institution($authobj->institution); $institution = new Institution($authobj->institution);
$maxusers = $institution->maxuseraccounts; $maxusers = $institution->maxuseraccounts;
if (!empty($maxusers)) { if (!empty($maxusers)) {
$members = count_records_sql(' $members = count_records_sql('
SELECT COUNT(*) FROM {usr} u INNER JOIN {usr_institution} i ON u.id = i.usr SELECT COUNT(*) FROM {usr} u INNER JOIN {usr_institution} i ON u.id = i.usr
...@@ -555,7 +555,7 @@ function uploadcsv_submit(Pieform $form, $values) { ...@@ -555,7 +555,7 @@ function uploadcsv_submit(Pieform $form, $values) {
// Reenable email // Reenable email
set_config('sendemail', $cfgsendemail); set_config('sendemail', $cfgsendemail);
// Only send e-mail to users after we're sure they have been inserted // Only send e-mail to users after we're sure they have been inserted
// successfully // successfully
$straccountcreatedtext = ($values['forcepasswordchange']) ? 'accountcreatedchangepasswordtext' : 'accountcreatedtext'; $straccountcreatedtext = ($values['forcepasswordchange']) ? 'accountcreatedchangepasswordtext' : 'accountcreatedtext';
$straccountcreatedhtml = ($values['forcepasswordchange']) ? 'accountcreatedchangepasswordhtml' : 'accountcreatedhtml'; $straccountcreatedhtml = ($values['forcepasswordchange']) ? 'accountcreatedchangepasswordhtml' : 'accountcreatedhtml';
......
...@@ -59,7 +59,7 @@ class Client { ...@@ -59,7 +59,7 @@ class Client {
$response_code = $result->info['http_code']; $response_code = $result->info['http_code'];
$response_code_prefix = substr($response_code, 0, 1); $response_code_prefix = substr($response_code, 0, 1);
if ('2' != $response_code_prefix) { if ('2' != $response_code_prefix) {
if ('4' == $response_code_prefix) { if ('4' == $response_code_prefix) {
throw new XmlrpcClientException('Client error code: '. $response_code); throw new XmlrpcClientException('Client error code: '. $response_code);
...@@ -90,7 +90,7 @@ class Client { ...@@ -90,7 +90,7 @@ class Client {
if ($xml->getName() == 'encryptedMessage') { if ($xml->getName() == 'encryptedMessage') {
$payload_encrypted = true; $payload_encrypted = true;
$wwwroot = (string)$xml->wwwroot; $wwwroot = (string)$xml->wwwroot;
// Strip encryption, using an older code is OK, because we're the client. // Strip encryption, using an older code is OK, because we're the client.
// The server is able to respond with the correct key, be we're not // The server is able to respond with the correct key, be we're not
$payload = xmlenc_envelope_strip($xml, true); $payload = xmlenc_envelope_strip($xml, true);
} }
...@@ -126,7 +126,7 @@ class Client { ...@@ -126,7 +126,7 @@ class Client {
if (is_array($this->response) && array_key_exists('faultCode', $this->response)) { if (is_array($this->response) && array_key_exists('faultCode', $this->response)) {
if ($this->response['faultCode'] == 7025) { if ($this->response['faultCode'] == 7025) {
log_info('Remote application has sent us a new public key'); log_info('Remote application has sent us a new public key');
// The remote application sent back a new public key, the // The remote application sent back a new public key, the
// old one must have expired // old one must have expired
if (array_key_exists('faultString', $this->response)) { if (array_key_exists('faultString', $this->response)) {
$details = openssl_x509_parse($this->response['faultString']); $details = openssl_x509_parse($this->response['faultString']);
...@@ -141,8 +141,8 @@ class Client { ...@@ -141,8 +141,8 @@ class Client {
update_record('host', $updateobj, $whereobj); update_record('host', $updateobj, $whereobj);
log_info('New key has been imported. Valid until ' . date('Y/m/d h:i:s', $details['validTo_time_t'])); log_info('New key has been imported. Valid until ' . date('Y/m/d h:i:s', $details['validTo_time_t']));
// Send request again. But don't use the cached // Send request again. But don't use the cached
// peer, look it up again now we've changed the // peer, look it up again now we've changed the
// public key // public key
$this->send($wwwroot, false); $this->send($wwwroot, false);
} }
......
...@@ -19,13 +19,13 @@ class Dispatcher { ...@@ -19,13 +19,13 @@ class Dispatcher {
private $system_methods = array('system.listMethods' => 'list_methods', private $system_methods = array('system.listMethods' => 'list_methods',
'system/listMethods' => 'list_methods', 'system/listMethods' => 'list_methods',
'system.methodSignature' => 'method_signature', 'system.methodSignature' => 'method_signature',
'system/methodSignature' => 'method_signature', 'system/methodSignature' => 'method_signature',
'system.methodHelp' => 'method_help', 'system.methodHelp' => 'method_help',
'system/methodHelp' => 'method_help', 'system/methodHelp' => 'method_help',
'system.listServices' => 'list_services', 'system.listServices' => 'list_services',
'system/listServices' => 'list_services', 'system/listServices' => 'list_services',
'system.keyswap' => 'keyswap', 'system.keyswap' => 'keyswap',
'system/keyswap' => 'keyswap'); 'system/keyswap' => 'keyswap');
private $services = array( private $services = array(
...@@ -69,9 +69,9 @@ class Dispatcher { ...@@ -69,9 +69,9 @@ class Dispatcher {
private $methodsig = array( private $methodsig = array(
'user_authorise' => array( 'user_authorise' => array(
array( array(
array('type' => 'array', array('type' => 'array',
'description' => '$userdata Array of user info for remote host' 'description' => '$userdata Array of user info for remote host'
), ),
array('type' => 'string', array('type' => 'string',
'description' => 'token - The unique ID provided by remotehost.' 'description' => 'token - The unique ID provided by remotehost.'
), ),
...@@ -83,9 +83,9 @@ class Dispatcher { ...@@ -83,9 +83,9 @@ class Dispatcher {
'fetch_user_image' => array( 'fetch_user_image' => array(
array( array(
array('type' => 'string', array('type' => 'string',
'description' => 'The encoded image.' 'description' => 'The encoded image.'
), ),
array('type' => 'string', array('type' => 'string',
'description' => 'username - The id of the user.' 'description' => 'username - The id of the user.'
) )
......
...@@ -65,7 +65,7 @@ function start_jump_session($peer, $instanceid, $wantsurl="") { ...@@ -65,7 +65,7 @@ function start_jump_session($peer, $instanceid, $wantsurl="") {
} }
if (false == $approved) { if (false == $approved) {