@@ -19,12 +19,12 @@ discard block |
||
| 19 | 19 | { |
| 20 | 20 | $fileData = $pptData['file_data']; |
| 21 | 21 | $dataInfo = pathinfo($pptData['file_name']); |
| 22 | - $fileName = basename($pptData['file_name'], '.' . $dataInfo['extension']); |
|
| 22 | + $fileName = basename($pptData['file_name'], '.'.$dataInfo['extension']); |
|
| 23 | 23 | $fullFileName = $pptData['file_name']; |
| 24 | 24 | |
| 25 | 25 | $tempArchivePath = api_get_path(SYS_ARCHIVE_PATH); |
| 26 | - $tempPath = $tempArchivePath . 'wsConvert/' . $fileName . '/'; |
|
| 27 | - $tempPathNewFiles = $tempArchivePath . 'wsConvert/' . $fileName . '-n/'; |
|
| 26 | + $tempPath = $tempArchivePath.'wsConvert/'.$fileName.'/'; |
|
| 27 | + $tempPathNewFiles = $tempArchivePath.'wsConvert/'.$fileName.'-n/'; |
|
| 28 | 28 | |
| 29 | 29 | $perms = api_get_permissions_for_new_directories(); |
| 30 | 30 | if (!is_dir($tempPath)) { |
@@ -33,28 +33,28 @@ discard block |
||
| 33 | 33 | if (!is_dir($tempPathNewFiles)) { |
| 34 | 34 | mkdir($tempPathNewFiles, $perms, true); |
| 35 | 35 | } |
| 36 | - if (!is_dir($tempPathNewFiles . $fileName)) { |
|
| 37 | - mkdir($tempPathNewFiles . $fileName, $perms, true); |
|
| 36 | + if (!is_dir($tempPathNewFiles.$fileName)) { |
|
| 37 | + mkdir($tempPathNewFiles.$fileName, $perms, true); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $file = base64_decode($fileData); |
| 41 | - file_put_contents($tempPath . $fullFileName, $file); |
|
| 41 | + file_put_contents($tempPath.$fullFileName, $file); |
|
| 42 | 42 | |
| 43 | 43 | if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php |
| 44 | - $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png'); |
|
| 45 | - $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar'; |
|
| 46 | - $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $classPath . '" DokeosConverter'; |
|
| 44 | + $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png'); |
|
| 45 | + $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar'; |
|
| 46 | + $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$classPath.'" DokeosConverter'; |
|
| 47 | 47 | } else { |
| 48 | - $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png'; |
|
| 48 | + $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png'; |
|
| 49 | 49 | $classPath = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar'; |
| 50 | - $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' DokeosConverter'; |
|
| 50 | + $cmd = 'cd '.$converterPath.' && java '.$classPath.' DokeosConverter'; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port'); |
|
| 54 | - $cmd .= ' -w 720 -h 540 -d oogie "' . $tempPath . $fullFileName.'" "' . $tempPathNewFiles . $fileName . '.html"'; |
|
| 53 | + $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port'); |
|
| 54 | + $cmd .= ' -w 720 -h 540 -d oogie "'.$tempPath.$fullFileName.'" "'.$tempPathNewFiles.$fileName.'.html"'; |
|
| 55 | 55 | |
| 56 | 56 | $perms = api_get_permissions_for_new_files(); |
| 57 | - chmod($tempPathNewFiles . $fileName, $perms); |
|
| 57 | + chmod($tempPathNewFiles.$fileName, $perms); |
|
| 58 | 58 | |
| 59 | 59 | $files = array(); |
| 60 | 60 | $return = 0; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $images = array(); |
| 65 | 65 | foreach ($files as $file) { |
| 66 | 66 | $imageData = explode('||', $file); |
| 67 | - $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles . $fileName . '/' . $imageData[1])); |
|
| 67 | + $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles.$fileName.'/'.$imageData[1])); |
|
| 68 | 68 | } |
| 69 | 69 | $data = array( |
| 70 | 70 | 'files' => $files, |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | function deleteDirectory($directoryPath) |
| 91 | 91 | { |
| 92 | - $files = array_diff(scandir($directoryPath), array('.','..')); |
|
| 92 | + $files = array_diff(scandir($directoryPath), array('.', '..')); |
|
| 93 | 93 | foreach ($files as $file) { |
| 94 | 94 | if (is_dir("$directoryPath/$file")) { |
| 95 | 95 | deleteDirectory("$directoryPath/$file"); |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $webCodePath = api_get_path(WEB_CODE_PATH); |
| 107 | 107 | $options = array( |
| 108 | 108 | 'uri' => $webPath, |
| 109 | - 'location' => $webCodePath . 'webservices/additional_webservices.php' |
|
| 109 | + 'location' => $webCodePath.'webservices/additional_webservices.php' |
|
| 110 | 110 | ); |
| 111 | 111 | |
| 112 | 112 | $soapServer = new SoapServer(NULL, $options); |