Minor - return array, fix conditions if array is empty

pull/2458/head
jmontoyaa 8 years ago
parent 23ad97173e
commit d3a36eff3a
  1. 6
      main/document/document.php
  2. 2
      main/document/document_quota.php
  3. 4
      main/inc/lib/document.lib.php
  4. 2
      main/inc/lib/javascript/svgedit/extensions/imagelib/groups.php
  5. 2
      main/inc/lib/javascript/svgedit/extensions/imagelib/index.php
  6. 8
      main/inc/lib/svg-edit/extensions/imagelib/groups.php
  7. 8
      main/inc/lib/svg-edit/extensions/imagelib/index.php
  8. 2
      main/inc/lib/webservices/Rest.php

@ -1784,7 +1784,7 @@ $userIsSubscribed = CourseManager::is_user_subscribed_in_course(
);
$getSizeURL = api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=get_dir_size&'.api_get_cidreq();
if (isset($documentAndFolders) && is_array($documentAndFolders)) {
if (!empty($documentAndFolders)) {
if ($groupId == 0 || $userAccess) {
$count = 1;
$countedPaths = [];
@ -1951,11 +1951,11 @@ if (isset($documentAndFolders) && is_array($documentAndFolders)) {
}
}
} else {
$sortable_data = '';
$sortable_data = [];
$table_footer = get_lang('NoDocsInFolder');
}
if (!is_null($documentAndFolders)) {
if (!empty($documentAndFolders)) {
// Show download zipped folder icon
if (!$is_certificate_mode && $total_size != 0
&& (

@ -79,7 +79,7 @@ if (!empty($group_list)) {
}
// Showing weight of documents uploaded by user
$document_list = DocumentManager::getAllDocumentData($_course);
if (is_array($document_list)) {
if (!empty($document_list)) {
foreach ($document_list as $document_data) {
if ($document_data['insert_user_id'] == api_get_user_id() && $document_data['filetype'] == 'file') {
$quota_bytes += $document_data['size'];

@ -484,7 +484,7 @@ class DocumentManager
$students = CourseManager::get_user_list_from_course_code($courseInfo['code'], $sessionId);
if (!empty($students)) {
$conditionList = [];
foreach ($students as $studentId => $studentInfo) {
foreach ($students as $studentInfo) {
$conditionList[] = '/shared_folder/sf_user_'.$studentInfo['user_id'];
}
$sharedCondition .= ' AND docs.path IN ("'.implode('","', $conditionList).'")';
@ -603,7 +603,7 @@ class DocumentManager
return $finalDocumentData;
} else {
return false;
return [];
}
}

@ -32,7 +32,7 @@ $docs_and_folders = DocumentManager::getAllDocumentData(
);
//get all group filenames
$array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
$array_to_search = !empty($docs_and_folders) ? $docs_and_folders : [];
if (count($array_to_search) > 0) {
while (list($key) = each($array_to_search)) {

@ -25,7 +25,7 @@ $docs_and_folders = DocumentManager::getAllDocumentData(
);
//get all filenames
$array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
$array_to_search = !empty($docs_and_folders) ? $docs_and_folders : [];
if (count($array_to_search) > 0) {
while (list($key) = each($array_to_search)) {

@ -35,12 +35,12 @@ $docs_and_folders = DocumentManager::getAllDocumentData(
);
// get all group filenames
$array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
$array_to_search = !empty($docs_and_folders) ? $docs_and_folders : array();
if (count($array_to_search) > 0) {
while (list($key) = each($array_to_search)) {
$all_files[] = basename($array_to_search[$key]['path']);
}
while (list($key) = each($array_to_search)) {
$all_files[] = basename($array_to_search[$key]['path']);
}
}
//get all svg and png group files

@ -26,12 +26,12 @@ $docs_and_folders = DocumentManager::getAllDocumentData(
);
//get all filenames
$array_to_search = is_array($docs_and_folders) ? $docs_and_folders : array();
$array_to_search = !empty($docs_and_folders) ? $docs_and_folders : array();
if (count($array_to_search) > 0) {
while (list($key) = each($array_to_search)) {
$all_files[] = basename($array_to_search[$key]['path']);
}
while (list($key) = each($array_to_search)) {
$all_files[] = basename($array_to_search[$key]['path']);
}
}
//get all svg and png files

@ -309,7 +309,7 @@ class Rest extends WebService
);
$results = [];
if (is_array($documents)) {
if (!empty($documents)) {
$webPath = api_get_path(WEB_CODE_PATH).'document/document.php?';
/** @var array $document */

Loading…
Cancel
Save