Fixing coding conventions -refs #6222

1.9.x
unknown 12 years ago
parent 5a7a1671aa
commit b749fdc0c8
  1. 24
      main/user/add_users_to_session.php
  2. 3
      main/user/resume_session.php

@ -60,7 +60,8 @@ if (is_array($extra_field_list)) {
} }
} }
function search_users($needle, $type) { function search_users($needle, $type)
{
global $tbl_user,$tbl_session_rel_user,$id_session; global $tbl_user,$tbl_session_rel_user,$id_session;
$xajax_response = new XajaxResponse(); $xajax_response = new XajaxResponse();
$return = ''; $return = '';
@ -82,7 +83,7 @@ function search_users($needle, $type) {
$cond_user_id = ''; $cond_user_id = '';
//Only for single & multiple //Only for single & multiple
if (in_array($type, array('single','multiple'))) if (in_array($type, array('single','multiple'))) {
if (!empty($id_session)) { if (!empty($id_session)) {
$id_session = intval($id_session); $id_session = intval($id_session);
// check id_user from session_rel_user table // check id_user from session_rel_user table
@ -98,6 +99,7 @@ function search_users($needle, $type) {
$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')'; $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
} }
} }
}
switch($type) { switch($type) {
case 'single': case 'single':
@ -560,7 +562,8 @@ if (!empty($errorMsg)) {
</form> </form>
<script> <script>
<!-- <!--
function moveItem(origin , destination){ function moveItem(origin , destination)
{
for (var i = 0 ; i<origin.options.length ; i++) { for (var i = 0 ; i<origin.options.length ; i++) {
if (origin.options[i].selected) { if (origin.options[i].selected) {
@ -574,7 +577,8 @@ function moveItem(origin , destination){
} }
function sortOptions(options) { function sortOptions(options)
{
newOptions = new Array(); newOptions = new Array();
for (i = 0 ; i<options.length ; i++) for (i = 0 ; i<options.length ; i++)
@ -587,7 +591,8 @@ function sortOptions(options) {
} }
function mysort(a, b){ function mysort(a, b)
{
if (a.text.toLowerCase() > b.text.toLowerCase()) { if (a.text.toLowerCase() > b.text.toLowerCase()) {
return 1; return 1;
} }
@ -597,7 +602,8 @@ function mysort(a, b){
return 0; return 0;
} }
function valide(){ function valide()
{
var options = document.getElementById('destination_users').options; var options = document.getElementById('destination_users').options;
for (i = 0 ; i<options.length ; i++) for (i = 0 ; i<options.length ; i++)
options[i].selected = true; options[i].selected = true;
@ -605,7 +611,8 @@ function valide(){
} }
function loadUsersInSelect(select){ function loadUsersInSelect(select)
{
var xhr_object = null; var xhr_object = null;
@ -636,7 +643,8 @@ function loadUsersInSelect(select){
} }
} }
function makepost(select){ function makepost(select)
{
var options = select.options; var options = select.options;
var ret = ""; var ret = "";

@ -132,8 +132,9 @@ echo Display::page_subheader(get_lang('GeneralProperties').$url);
<td><?php echo get_lang('Date'); ?> :</td> <td><?php echo get_lang('Date'); ?> :</td>
<td> <td>
<?php <?php
if ($session['date_start'] == '00-00-0000' && $session['date_end']== '00-00-0000' ) if ($session['date_start'] == '00-00-0000' && $session['date_end']== '00-00-0000' ) {
echo get_lang('NoTimeLimits'); echo get_lang('NoTimeLimits');
}
else { else {
if ($session['date_start'] != '00-00-0000') { if ($session['date_start'] != '00-00-0000') {
//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits')); //$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));

Loading…
Cancel
Save