From 6efc50520cf0e306d9675366a90008c3aae15a8d Mon Sep 17 00:00:00 2001 From: fgerlits Date: Thu, 10 May 2007 09:57:06 +0000 Subject: [PATCH] reverted the storageServer, archiveServer, storageAdmin and htmlUI modules to their branches/campcaster-1.2 (last known working) state --- campcaster/etc/Makefile.in | 26 +- .../src/modules/archiveServer/etc/Makefile.in | 50 +- .../src/modules/archiveServer/var/Archive.php | 16 +- .../modules/htmlUI/var/html/ui_browser.php | 4 +- .../modules/htmlUI/var/html/ui_handler.php | 4 +- .../var/templates/library/actionhandler.tpl | 12 +- .../templates/scratchpad/actionhandler.tpl | 18 +- .../var/templates/script/contextmenu.js.tpl | 12 +- .../templates/subjects/manageGroupMember.tpl | 2 +- .../modules/htmlUI/var/ui_handler.class.php | 2 +- .../modules/htmlUI/var/ui_search.class.php | 15 +- .../modules/htmlUI/var/ui_transfers.class.php | 8 +- .../src/modules/storageAdmin/var/backup.php | 4 +- .../storageAdmin/var/campcaster-import.php | 4 +- .../src/modules/storageAdmin/var/restore.php | 2 +- .../storageClient/src/WebStorageClient.cxx | 596 +++++++++--------- .../modules/storageServer/var/BasicStor.php | 154 +++-- .../modules/storageServer/var/DataEngine.php | 11 +- .../modules/storageServer/var/GreenBox.php | 313 ++++++--- .../src/modules/storageServer/var/LocStor.php | 481 ++------------ .../modules/storageServer/var/Playlist.php | 6 +- .../src/modules/storageServer/var/Prefs.php | 8 +- .../modules/storageServer/var/Renderer.php | 4 +- .../modules/storageServer/var/StoredFile.php | 7 + .../modules/storageServer/var/Transport.php | 304 ++++++--- .../storageServer/var/TransportRecord.php | 4 +- .../src/modules/storageServer/var/conf.php | 4 +- .../storageServer/var/conf.php.template | 4 +- .../storageServer/var/conf_only.php.template | 4 +- .../var/cron/transportCronJob.php | 5 +- .../var/install/upgrade/upgrade-to-1.3.0.php | 37 -- .../storageServer/var/tests/transTest.php | 4 +- .../storageServer/var/xmlrpc/XR_LocStor.php | 254 +------- .../storageServer/var/xmlrpc/simpleGet.php | 4 +- .../storageServer/var/xmlrpc/xrLocStor.php | 163 +++-- .../storageServer/var/xmlrpc/xr_cli_test.php | 19 +- .../storageServer/var/xmlrpc/xr_web_test.php | 62 +- 37 files changed, 1103 insertions(+), 1524 deletions(-) delete mode 100644 campcaster/src/modules/storageServer/var/install/upgrade/upgrade-to-1.3.0.php diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in index 19902d338..6c0ecc4a5 100644 --- a/campcaster/etc/Makefile.in +++ b/campcaster/etc/Makefile.in @@ -126,7 +126,7 @@ EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient WIDGETS_DIR = ${MODULES_DIR}/widgets ALIB_DIR = ${MODULES_DIR}/alib -#ARCHIVE_SERVER_DIR = ${MODULES_DIR}/archiveServer +ARCHIVE_SERVER_DIR = ${MODULES_DIR}/archiveServer GETID3_DIR = ${MODULES_DIR}/getid3 HTML_UI_DIR = ${MODULES_DIR}/htmlUI STORAGE_ADMIN_DIR = ${MODULES_DIR}/storageAdmin @@ -247,15 +247,15 @@ modules_setup: ${TMP_DIR}/modules_setup.stamp ${TMP_DIR}/modules_setup.stamp: cd ${ALIB_DIR} && ./configure --prefix=${prefix} \ PACKAGE_VERSION=${PACKAGE_VERSION} -# cd ${ARCHIVE_SERVER_DIR} && \ -# ./configure --prefix=${prefix} \ -# --with-hostname=${HOSTNAME} \ -# --with-www-port=${WWW_PORT} \ -# --with-database-server=${DB_SERVER} \ -# --with-database=${DATABASE} \ -# --with-database-user=${DB_USER} \ -# --with-database-password=${DB_PASSWORD} \ -# PACKAGE_VERSION=${PACKAGE_VERSION} + cd ${ARCHIVE_SERVER_DIR} && \ + ./configure --prefix=${prefix} \ + --with-hostname=${HOSTNAME} \ + --with-www-port=${WWW_PORT} \ + --with-database-server=${DB_SERVER} \ + --with-database=${DATABASE} \ + --with-database-user=${DB_USER} \ + --with-database-password=${DB_PASSWORD} \ + PACKAGE_VERSION=${PACKAGE_VERSION} cd ${GETID3_DIR} && ./configure --prefix=${prefix} \ PACKAGE_VERSION=${PACKAGE_VERSION} cd ${HTML_UI_DIR} && ./configure --prefix=${prefix} \ @@ -371,7 +371,7 @@ depclean: ${MAKE} -C ${WIDGETS_DIR} depclean ${MAKE} -C ${SCHEDULER_DIR} depclean ${MAKE} -C ${GLIVESUPPORT_DIR} depclean -# -${MAKE} -C ${ARCHIVE_SERVER_DIR} depclean + -${MAKE} -C ${ARCHIVE_SERVER_DIR} depclean -${MAKE} -C ${STORAGE_SERVER_DIR} depclean compile: ${TMP_DIR}/compile.stamp @@ -449,7 +449,7 @@ setup_install_dirs: install_modules: ${MAKE} -C ${ALIB_DIR} install -# ${MAKE} -C ${ARCHIVE_SERVER_DIR} install + ${MAKE} -C ${ARCHIVE_SERVER_DIR} install ${MAKE} -C ${GETID3_DIR} install ${MAKE} -C ${HTML_UI_DIR} install ${MAKE} -C ${STORAGE_ADMIN_DIR} install @@ -467,5 +467,5 @@ install_modules: install_products: ${MAKE} -C ${SCHEDULER_DIR} install ${MAKE} -C ${GLIVESUPPORT_DIR} install - + diff --git a/campcaster/src/modules/archiveServer/etc/Makefile.in b/campcaster/src/modules/archiveServer/etc/Makefile.in index 9cfb3fe89..755693066 100644 --- a/campcaster/src/modules/archiveServer/etc/Makefile.in +++ b/campcaster/src/modules/archiveServer/etc/Makefile.in @@ -132,25 +132,25 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ all: doc: -# ${DOXYGEN} ${DOXYGEN_CONFIG} + ${DOXYGEN} ${DOXYGEN_CONFIG} clean: db_clean -# ${RMDIR} ${STOR_DIR} -# ${RMDIR} ${ACCESS_DIR} -# ${RMDIR} ${TRANS_DIR} + ${RMDIR} ${STOR_DIR} + ${RMDIR} ${ACCESS_DIR} + ${RMDIR} ${TRANS_DIR} docclean: -# ${RMDIR} ${DOXYGEN_DIR}/html + ${RMDIR} ${DOXYGEN_DIR}/html depclean: clean dist: -# ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * + ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * distclean: clean docclean testonly: ${TEST_RUNNER} -# ${TEST_RUNNER} + ${TEST_RUNNER} check: all #testonly @@ -158,39 +158,39 @@ check: all recheck: clean check install: -# ${MKDIR} ${DEST_DIR} -# ${MKDIR} ${DEST_DIR}/access -# ${MKDIR} ${DEST_DIR}/install -# ${MKDIR} ${DEST_DIR}/stor -# ${MKDIR} ${DEST_DIR}/stor/buffer -# ${MKDIR} ${DEST_DIR}/trans -# ${MKDIR} ${DEST_DIR}/xmlrpc -# ${CP} ${VAR_DIR}/*.{php,template} ${DEST_DIR} -# ${CP} ${VAR_DIR}/install/*.php ${DEST_DIR}/install -# ${CP} ${VAR_DIR}/xmlrpc/*.php ${DEST_DIR}/xmlrpc -# ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \ -# > ${DEST_DIR}/conf.php - + ${MKDIR} ${DEST_DIR} + ${MKDIR} ${DEST_DIR}/access + ${MKDIR} ${DEST_DIR}/install + ${MKDIR} ${DEST_DIR}/stor + ${MKDIR} ${DEST_DIR}/stor/buffer + ${MKDIR} ${DEST_DIR}/trans + ${MKDIR} ${DEST_DIR}/xmlrpc + ${CP} ${VAR_DIR}/*.{php,template} ${DEST_DIR} + ${CP} ${VAR_DIR}/install/*.php ${DEST_DIR}/install + ${CP} ${VAR_DIR}/xmlrpc/*.php ${DEST_DIR}/xmlrpc + ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \ + > ${DEST_DIR}/conf.php + #------------------------------------------------------------------------------- # Specific targets #------------------------------------------------------------------------------- storage: dir_setup db_init dir_setup: ${DOXYGEN_DIR} -# bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} + bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} db_init: -# -cd var/install && php -q install.php + -cd var/install && php -q install.php db_clean: -# -cd var/install && php -q uninstall.php + -cd var/install && php -q uninstall.php ${TMP_DIR}: -# ${MKDIR} ${TMP_DIR} + ${MKDIR} ${TMP_DIR} ${DOXYGEN_DIR}: -# ${MKDIR} ${DOXYGEN_DIR} + ${MKDIR} ${DOXYGEN_DIR} ${TEST_RUNNER}: diff --git a/campcaster/src/modules/archiveServer/var/Archive.php b/campcaster/src/modules/archiveServer/var/Archive.php index 1bac8e1e6..f18b16ef1 100644 --- a/campcaster/src/modules/archiveServer/var/Archive.php +++ b/campcaster/src/modules/archiveServer/var/Archive.php @@ -34,7 +34,7 @@ class Archive extends XR_LocStor { if (PEAR::isError($owner)) { return $owner; } - $res = BasicStor::bsOpenPut($chsum, NULL, $owner); + $res = $this->bsOpenPut($chsum, NULL, $owner); if (PEAR::isError($res)) { return $res; } @@ -52,7 +52,7 @@ class Archive extends XR_LocStor { */ function uploadCheck($token) { - return BasicStor::bsCheckPut($token); + return $this->bsCheckPut($token); } @@ -69,7 +69,7 @@ class Archive extends XR_LocStor { */ function uploadClose($token, $trtype, $pars=array()) { - $res = BasicStor::bsClosePut($token); + $res = $this->bsClosePut($token); if (PEAR::isError($res)) { return $res; } @@ -77,7 +77,7 @@ class Archive extends XR_LocStor { switch ($trtype) { case "audioclip": $mdtoken = $pars['mdpdtoken']; - $res = BasicStor::bsClosePut($mdtoken); + $res = $this->bsClosePut($mdtoken); if (PEAR::isError($res)) { return $res; } @@ -128,7 +128,7 @@ class Archive extends XR_LocStor { case "playlistPkg": $chsum = md5_file($fname); // importPlaylistOpen: - $res = BasicStor::bsOpenPut($chsum, NULL, $owner); + $res = $this->bsOpenPut($chsum, NULL, $owner); if (PEAR::isError($res)) { return $res; } @@ -225,14 +225,14 @@ class Archive extends XR_LocStor { $res = $this->accessPlaylist($sessid, $gunid); break; case "playlistPkg": - $res = BasicStor::bsExportPlaylistOpen($gunid); + $res = $this->bsExportPlaylistOpen($gunid); if (PEAR::isError($res)) { return $res; } $tmpn = tempnam($CC_CONFIG['transDir'], 'plExport_'); $plfpath = "$tmpn.lspl"; copy($res['fname'], $plfpath); - $res = BasicStor::bsExportPlaylistClose($res['token']); + $res = $this->bsExportPlaylistClose($res['token']); if (PEAR::isError($res)) { return $res; } @@ -268,7 +268,7 @@ class Archive extends XR_LocStor { case "metadata": case "playlist": case "playlistPkg": - $title = BasicStor::bsGetTitle(NULL, $gunid); + $title = $this->bsGetTitle(NULL, $gunid); break; case "searchjob": $title = 'searchjob'; diff --git a/campcaster/src/modules/htmlUI/var/html/ui_browser.php b/campcaster/src/modules/htmlUI/var/html/ui_browser.php index eae7e8f5e..876fe6c42 100644 --- a/campcaster/src/modules/htmlUI/var/html/ui_browser.php +++ b/campcaster/src/modules/htmlUI/var/html/ui_browser.php @@ -193,8 +193,8 @@ if (isset($_REQUEST['popup']) && is_array($_REQUEST['popup'])){ $uiBrowser->EXCHANGE->createBackupDownload(); break; - case 'TR.confirmUploadToHub': - $uiBrowser->TRANSFERS->uploadToHub($_REQUEST['id']); + case 'TR.confirmUpload2Hub': + $uiBrowser->TRANSFERS->upload2Hub($_REQUEST['id']); $Smarty->display('popup/TR.confirmTransfer.tpl'); break; diff --git a/campcaster/src/modules/htmlUI/var/html/ui_handler.php b/campcaster/src/modules/htmlUI/var/html/ui_handler.php index 5b2c25470..5c8e0af62 100644 --- a/campcaster/src/modules/htmlUI/var/html/ui_handler.php +++ b/campcaster/src/modules/htmlUI/var/html/ui_handler.php @@ -202,10 +202,8 @@ switch ($_REQUEST['act']) { break; case "HUBSEARCH.newSearch": - $uiHandler->SEARCH->newSearch($_REQUEST, "remote"); + $uiHandler->HUBSEARCH->newSearch($_REQUEST); break; -// $uiHandler->HUBSEARCH->newSearch($_REQUEST); -// break; case "HUBSEARCH.reorder": $uiHandler->HUBSEARCH->reorder($_REQUEST['by']); diff --git a/campcaster/src/modules/htmlUI/var/templates/library/actionhandler.tpl b/campcaster/src/modules/htmlUI/var/templates/library/actionhandler.tpl index bcf4d8ab8..48be54848 100644 --- a/campcaster/src/modules/htmlUI/var/templates/library/actionhandler.tpl +++ b/campcaster/src/modules/htmlUI/var/templates/library/actionhandler.tpl @@ -1,28 +1,28 @@ onClick="return contextmenu('{$i.id}' , 'SP.addItem' - + {if $i.type|lower == 'audioclip'} , 'listen', '{$i.gunid}' - + {if $_PL_activeId} , 'PL.addItem' {else} , 'PL.create' {/if} - + , 'edit' , 'delete' {/if} {if $i.type|lower == 'webstream'} , 'listen', '{$i.gunid}' - + {if $_PL_activeId} , 'PL.addStream' {else} , 'PL.create' {/if} - + , 'edit' , 'delete' {/if} @@ -45,6 +45,6 @@ onClick="return contextmenu('{$i.id}' {/if} {/if} - , 'TR.uploadToHub' + , 'TR.upload2Hub' )" diff --git a/campcaster/src/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl b/campcaster/src/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl index a92cdcbef..e350c03c7 100644 --- a/campcaster/src/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl +++ b/campcaster/src/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl @@ -1,32 +1,32 @@ onClick="return contextmenu('{$i.id}' , 'SP.removeItem' - + {if $i.type|lower == 'audioclip'} , 'listen', '{$i.gunid}' - + {if $_PL_activeId} , 'PL.addItem' {else} - , 'PL.create' + , 'PL.create' {/if} - + , 'edit' , 'delete' {/if} {if $i.type|lower == 'webstream'} , 'listen', '{$i.gunid}' - + {if $_PL_activeId} {if $i.duration == '00:00:00.000000'} , 'PL.addStream' {else} , 'PL.addItem' - {/if} + {/if} {else} , 'PL.create' {/if} - + , 'edit' , 'delete' {/if} @@ -49,6 +49,6 @@ onClick="return contextmenu('{$i.id}' , 'PL.export' {/if} {/if} - - , 'TR.uploadToHub' + + , 'TR.upload2Hub' )" \ No newline at end of file diff --git a/campcaster/src/modules/htmlUI/var/templates/script/contextmenu.js.tpl b/campcaster/src/modules/htmlUI/var/templates/script/contextmenu.js.tpl index 12498956a..0268e5d67 100644 --- a/campcaster/src/modules/htmlUI/var/templates/script/contextmenu.js.tpl +++ b/campcaster/src/modules/htmlUI/var/templates/script/contextmenu.js.tpl @@ -1,6 +1,6 @@ {literal}