hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore code format after netbeans update

Browse Source
This commit is contained in:
jygaulier
2012-05-10 18:39:20 +02:00
parent d834d4f3f8
commit 22c492f69d
16 changed files with 340 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

430
lib/classes/API/V1/adapter.class.php
View File

@@ -111,10 +111,10 @@ class API_V1_adapter extends API_V1_Abstract
$ret = array();
foreach ($tasks as $task) {
$ret[$task->getID()] = array(
'id' => $task->getID(),
'state' => $task->getState(),
'pid' => $task->getPID(),
'title' => $task->getTitle(),
'id' => $task->getID(),
'state' => $task->getState(),
'pid' => $task->getPID(),
'title' => $task->getTitle(),
'last_exec_time' => $task->getLastExecTime()
);
}
@@ -293,7 +293,7 @@ class API_V1_adapter extends API_V1_Abstract
if ($mainCache instanceof \Alchemy\Phrasea\Cache\Cache) {
$ret['cache']['main'] = array(
'type' => $mainCache->getName(),
'type' => $mainCache->getName(),
'stats' => $mainCache->getStats()
);
} else {
@@ -302,7 +302,7 @@ class API_V1_adapter extends API_V1_Abstract
if ($opCodeCache instanceof \Alchemy\Phrasea\Cache\Cache) {
$ret['cache']['op_code'] = array(
'type' => $mainCache->getName(),
'type' => $mainCache->getName(),
'stats' => $opCodeCache->getStats()
);
} else {
@@ -323,7 +323,7 @@ class API_V1_adapter extends API_V1_Abstract
$ret = array();
$ret['phraseanet']['version'] = array(
'name' => $app['Core']['Version']::getName(),
'name' => $app['Core']['Version']::getName(),
'number' => $app['Core']['Version']::getNumber(),
);
@@ -349,158 +349,158 @@ class API_V1_adapter extends API_V1_Abstract
return array(
'global_values' => array(
'serverName' => $registry->get('GV_ServerName'),
'title' => $registry->get('GV_homeTitle'),
'keywords' => $registry->get('GV_metaKeywords'),
'serverName' => $registry->get('GV_ServerName'),
'title' => $registry->get('GV_homeTitle'),
'keywords' => $registry->get('GV_metaKeywords'),
'description' => $registry->get('GV_metaDescription'),
'httpServer' => array(
'logErrors' => $registry->get('GV_log_errors'),
'phpTimezone' => $registry->get('GV_timezone'),
'siteId' => $registry->get('GV_sit'),
'staticUrl' => $registry->get('GV_STATIC_URL'),
'httpServer' => array(
'logErrors' => $registry->get('GV_log_errors'),
'phpTimezone' => $registry->get('GV_timezone'),
'siteId' => $registry->get('GV_sit'),
'staticUrl' => $registry->get('GV_STATIC_URL'),
'defaultLanguage' => $registry->get('id_GV_default_lng'),
'allowIndexing' => $registry->get('GV_allow_search_engine'),
'modes' => array(
'XsendFile' => $registry->get('GV_modxsendfile'),
'nginxXAccelRedirect' => $registry->get('GV_X_Accel_Redirect'),
'allowIndexing' => $registry->get('GV_allow_search_engine'),
'modes' => array(
'XsendFile' => $registry->get('GV_modxsendfile'),
'nginxXAccelRedirect' => $registry->get('GV_X_Accel_Redirect'),
'nginxXAccelRedirectMountPoint' => $registry->get('GV_X_Accel_Redirect_mount_point'),
'h264Streaming' => $registry->get('GV_h264_streaming'),
'authTokenDirectory' => $registry->get('GV_mod_auth_token_directory'),
'authTokenDirectoryPath' => $registry->get('GV_mod_auth_token_directory_path'),
'authTokenPassphrase' => $registry->get('GV_mod_auth_token_passphrase'),
'h264Streaming' => $registry->get('GV_h264_streaming'),
'authTokenDirectory' => $registry->get('GV_mod_auth_token_directory'),
'authTokenDirectoryPath' => $registry->get('GV_mod_auth_token_directory_path'),
'authTokenPassphrase' => $registry->get('GV_mod_auth_token_passphrase'),
),
'files' => array(
'owner' => $registry->get('GV_filesOwner'),
'group' => $registry->get('GV_filesOwner'),
'files' => array(
'owner' => $registry->get('GV_filesOwner'),
'group' => $registry->get('GV_filesOwner'),
)
),
'maintenance' => array(
'alertMessage' => $registry->get('GV_message'),
'alertMessage' => $registry->get('GV_message'),
'displayMessage' => $registry->get('GV_message_on'),
),
'webServices' => array(
'googleApi' => $registry->get('GV_google_api'),
'googleAnalyticsId' => $registry->get('GV_googleAnalytics'),
'webServices' => array(
'googleApi' => $registry->get('GV_google_api'),
'googleAnalyticsId' => $registry->get('GV_googleAnalytics'),
'googleChromeFrameDisclaimer' => $registry->get('GV_display_gcf'),
'i18nWebService' => $registry->get('GV_i18n_service'),
'recaptacha' => array(
'active' => $registry->get('GV_captchas'),
'publicKey' => $registry->get('GV_captcha_public_key'),
'i18nWebService' => $registry->get('GV_i18n_service'),
'recaptacha' => array(
'active' => $registry->get('GV_captchas'),
'publicKey' => $registry->get('GV_captcha_public_key'),
'privateKey' => $registry->get('GV_captcha_private_key'),
),
'youtube' => array(
'active' => $registry->get('GV_youtube_api'),
'clientId' => $registry->get('GV_youtube_client_id'),
'youtube' => array(
'active' => $registry->get('GV_youtube_api'),
'clientId' => $registry->get('GV_youtube_client_id'),
'clientSecret' => $registry->get('GV_youtube_client_secret'),
'devKey' => $registry->get('GV_youtube_dev_key'),
'devKey' => $registry->get('GV_youtube_dev_key'),
),
'flickr' => array(
'active' => $registry->get('GV_flickr_api'),
'clientId' => $registry->get('GV_flickr_client_id'),
'flickr' => array(
'active' => $registry->get('GV_flickr_api'),
'clientId' => $registry->get('GV_flickr_client_id'),
'clientSecret' => $registry->get('GV_flickr_client_secret'),
),
'dailymtotion' => array(
'active' => $registry->get('GV_dailymotion_api'),
'clientId' => $registry->get('GV_dailymotion_client_id'),
'active' => $registry->get('GV_dailymotion_api'),
'clientId' => $registry->get('GV_dailymotion_client_id'),
'clientSecret' => $registry->get('GV_dailymotion_client_secret'),
)
),
'navigator' => array(
'active' => $registry->get('GV_client_navigator'),
'navigator' => array(
'active' => $registry->get('GV_client_navigator'),
),
'homepage' => array(
'viewType' => $registry->get('GV_home_publi'),
),
'report' => array(
'report' => array(
'anonymous' => $registry->get('GV_anonymousReport'),
),
'events' => array(
'events' => $registry->get('GV_events'),
'events' => array(
'events' => $registry->get('GV_events'),
'notifications' => $registry->get('GV_notifications'),
),
'upload' => array(
'upload' => array(
'allowedFileExtension' => $registry->get('GV_appletAllowedFileEx'),
),
'filesystem' => array(
'web' => $registry->get('GV_base_datapath_web'),
'noWeb' => $registry->get('GV_base_datapath_noweb'),
'thumbnail' => $registry->get('GV_base_dataurl'),
'filesystem' => array(
'web' => $registry->get('GV_base_datapath_web'),
'noWeb' => $registry->get('GV_base_datapath_noweb'),
'thumbnail' => $registry->get('GV_base_dataurl'),
),
'searchEngine' => array(
'configuration' => array(
'defaultQuery' => $registry->get('GV_defaultQuery'),
'defaultQuery' => $registry->get('GV_defaultQuery'),
'defaultQueryType' => $registry->get('GV_defaultQuery_type'),
),
'sphinx' => array(
'active' => $registry->get('GV_sphinx'),
'host' => $registry->get('GV_sphinx_host'),
'port' => $registry->get('GV_sphinx_port'),
'sphinx' => array(
'active' => $registry->get('GV_sphinx'),
'host' => $registry->get('GV_sphinx_host'),
'port' => $registry->get('GV_sphinx_port'),
'realtimeHost' => $registry->get('GV_sphinx_rt_host'),
'realtimePort' => $registry->get('GV_sphinx_rt_port'),
),
'phrasea' => array(
'phrasea' => array(
'minChar' => $registry->get('GV_min_letters_truncation'),
'sort' => $registry->get('GV_phrasea_sort'),
'sort' => $registry->get('GV_phrasea_sort'),
),
),
'binary' => array(
'phpCli' => $registry->get('GV_cli'),
'phpIni' => $registry->get('GV_PHP_INI'),
'imagick' => $registry->get('GV_imagick'),
'swfExtract' => $registry->get('GV_swf_extract'),
'pdf2swf' => $registry->get('GV_pdf2swf'),
'swfRender' => $registry->get('GV_swf_render'),
'unoconv' => $registry->get('GV_unoconv'),
'ffmpeg' => $registry->get('GV_ffmpeg'),
'mp4box' => $registry->get('GV_mp4box'),
'pdftotext' => $registry->get('GV_pdftotext'),
'pdfmaxpages' => $registry->get('GV_pdfmaxpages'),),
'binary' => array(
'phpCli' => $registry->get('GV_cli'),
'phpIni' => $registry->get('GV_PHP_INI'),
'imagick' => $registry->get('GV_imagick'),
'swfExtract' => $registry->get('GV_swf_extract'),
'pdf2swf' => $registry->get('GV_pdf2swf'),
'swfRender' => $registry->get('GV_swf_render'),
'unoconv' => $registry->get('GV_unoconv'),
'ffmpeg' => $registry->get('GV_ffmpeg'),
'mp4box' => $registry->get('GV_mp4box'),
'pdftotext' => $registry->get('GV_pdftotext'),
'pdfmaxpages' => $registry->get('GV_pdfmaxpages'),),
'mainConfiguration' => array(
'adminMail' => $registry->get('GV_adminMail'),
'adminMail' => $registry->get('GV_adminMail'),
'viewBasAndCollName' => $registry->get('GV_view_bas_and_coll'),
'chooseExportTitle' => $registry->get('GV_choose_export_title'),
'chooseExportTitle' => $registry->get('GV_choose_export_title'),
'defaultExportTitle' => $registry->get('GV_default_export_title'),
'socialTools' => $registry->get('GV_social_tools'),),
'modules' => array(
'thesaurus' => $registry->get('GV_thesaurus'),
'storyMode' => $registry->get('GV_multiAndReport'),
'docSubsitution' => $registry->get('GV_seeOngChgDoc'),
'socialTools' => $registry->get('GV_social_tools'),),
'modules' => array(
'thesaurus' => $registry->get('GV_thesaurus'),
'storyMode' => $registry->get('GV_multiAndReport'),
'docSubsitution' => $registry->get('GV_seeOngChgDoc'),
'subdefSubstitution' => $registry->get('GV_seeNewThumb'),),
'email' => array(
'email' => array(
'defaultMailAddress' => $registry->get('GV_defaulmailsenderaddr'),
'smtp' => array(
'active' => $registry->get('GV_smtp'),
'auth' => $registry->get('GV_smtp_auth'),
'host' => $registry->get('GV_smtp_host'),
'port' => $registry->get('GV_smtp_port'),
'secure' => $registry->get('GV_smtp_secure'),
'user' => $registry->get('GV_smtp_user'),
'smtp' => array(
'active' => $registry->get('GV_smtp'),
'auth' => $registry->get('GV_smtp_auth'),
'host' => $registry->get('GV_smtp_host'),
'port' => $registry->get('GV_smtp_port'),
'secure' => $registry->get('GV_smtp_secure'),
'user' => $registry->get('GV_smtp_user'),
'password' => $registry->get('GV_smtp_password'),
),
),
'ftp' => array(
'active' => $registry->get('GV_activeFTP'),
'ftp' => array(
'active' => $registry->get('GV_activeFTP'),
'activeForUser' => $registry->get('GV_ftp_for_user'),),
'client' => array(
'maxSizeDownload' => $registry->get('GV_download_max'),
'tabSearchMode' => $registry->get('GV_ong_search'),
'tabAdvSearchPosition' => $registry->get('GV_ong_advsearch'),
'tabTopicsPosition' => $registry->get('GV_ong_topics'),
'tabOngActifPosition' => $registry->get('GV_ong_actif'),
'renderTopicsMode' => $registry->get('GV_client_render_topics'),
'displayRolloverPreview' => $registry->get('GV_rollover_reg_preview'),
'displayRolloverBasket' => $registry->get('GV_rollover_chu'),
'collRenderMode' => $registry->get('GV_client_coll_ckbox'),
'viewSizeBaket' => $registry->get('GV_viewSizeBaket'),
'client' => array(
'maxSizeDownload' => $registry->get('GV_download_max'),
'tabSearchMode' => $registry->get('GV_ong_search'),
'tabAdvSearchPosition' => $registry->get('GV_ong_advsearch'),
'tabTopicsPosition' => $registry->get('GV_ong_topics'),
'tabOngActifPosition' => $registry->get('GV_ong_actif'),
'renderTopicsMode' => $registry->get('GV_client_render_topics'),
'displayRolloverPreview' => $registry->get('GV_rollover_reg_preview'),
'displayRolloverBasket' => $registry->get('GV_rollover_chu'),
'collRenderMode' => $registry->get('GV_client_coll_ckbox'),
'viewSizeBaket' => $registry->get('GV_viewSizeBaket'),
'clientAutoShowProposals' => $registry->get('GV_clientAutoShowProposals'),
'needAuth2DL' => $registry->get('GV_needAuth2DL'),),
'inscription' => array(
'needAuth2DL' => $registry->get('GV_needAuth2DL'),),
'inscription' => array(
'autoSelectDB' => $registry->get('GV_autoselectDB'),
'autoRegister' => $registry->get('GV_autoregister'),
),
'push' => array(
'push' => array(
'validationReminder' => $registry->get('GV_validation_reminder'),
'expirationValue' => $registry->get('GV_val_expiration'),
'expirationValue' => $registry->get('GV_val_expiration'),
),
)
);
@@ -648,8 +648,8 @@ class API_V1_adapter extends API_V1_Abstract
foreach ($fields as $field) {
$ret[$field->get_meta_struct_id()] = array(
'meta_structure_id' => $field->get_meta_struct_id(),
'name' => $field->get_name(),
'value' => $field->get_serialized_values(";"),
'name' => $field->get_name(),
'value' => $field->get_serialized_values(";"),
);
}
$result->set_datas($ret);
@@ -688,16 +688,16 @@ class API_V1_adapter extends API_V1_Abstract
'status' => is_array($request->get('status')) ? $request->get('status') : array(),
'bases' => is_array($request->get('bases')) ? $request->get('bases') : array(),
'search_type' => $search_type,
'recordtype' => $record_type,
'datemin' => $request->get('datemin') ? : '',
'datemax' => $request->get('datemax') ? : '',
'datefield' => $request->get('datefield') ? : '',
'sort' => $request->get('sort') ? : '',
'ord' => $request->get('ord') ? : '',
'stemme' => $request->get('stemme') ? : '',
'per_page' => $request->get('per_page') ? : 10,
'query' => $request->get('query') ? : '',
'page' => (int) ($request->get('page') ? : 0),
'recordtype' => $record_type,
'datemin' => $request->get('datemin') ? : '',
'datemax' => $request->get('datemax') ? : '',
'datefield' => $request->get('datefield') ? : '',
'sort' => $request->get('sort') ? : '',
'ord' => $request->get('ord') ? : '',
'stemme' => $request->get('stemme') ? : '',
'per_page' => $request->get('per_page') ? : 10,
'query' => $request->get('query') ? : '',
'page' => (int) ($request->get('page') ? : 0),
);
if (is_array($request->get('bases')) === false) {
@@ -762,16 +762,16 @@ class API_V1_adapter extends API_V1_Abstract
$search_result = $search_engine->query_per_page($params['query'], $params["page"], $perPage);
$ret = array(
'total_pages' => $search_result->get_total_pages(),
'current_page' => $search_result->get_current_page(),
'total_pages' => $search_result->get_total_pages(),
'current_page' => $search_result->get_current_page(),
'available_results' => $search_result->get_count_available_results(),
'total_results' => $search_result->get_count_total_results(),
'error' => $search_result->get_error(),
'warning' => $search_result->get_warning(),
'query_time' => $search_result->get_query_time(),
'search_indexes' => $search_result->get_search_indexes(),
'suggestions' => $search_result->get_suggestions(),
'results' => array(),
'total_results' => $search_result->get_count_total_results(),
'error' => $search_result->get_error(),
'warning' => $search_result->get_warning(),
'query_time' => $search_result->get_query_time(),
'search_indexes' => $search_result->get_search_indexes(),
'suggestions' => $search_result->get_suggestions(),
'results' => array(),
'query' => $search_engine->get_query(),
);
@@ -1178,9 +1178,9 @@ class API_V1_adapter extends API_V1_Abstract
{
$ret = array(
'basket_element_id' => $basket_element->getId(),
'order' => $basket_element->getOrd(),
'record' => $this->list_record($basket_element->getRecord()),
'validation_item' => ! ! $basket_element->getValidationDatas(),
'order' => $basket_element->getOrd(),
'record' => $this->list_record($basket_element->getRecord()),
'validation_item' => ! ! $basket_element->getValidationDatas(),
);
if ($basket_element->getValidationDatas()) {
@@ -1191,12 +1191,12 @@ class API_V1_adapter extends API_V1_Abstract
$user = $validation_datas->getParticipant()->getUser();
/* @var $validation_datas Entities\ValidationData */
$choices[$user->get_id()] = array(
'usr_id' => $user->get_id(),
'usr_name' => $user->get_display_name(),
'is_mine' => $user->get_id() == $this->core->getAuthenticatedUser()->get_id(),
'agreement' => $validation_datas->getAgreement(),
'usr_id' => $user->get_id(),
'usr_name' => $user->get_display_name(),
'is_mine' => $user->get_id() == $this->core->getAuthenticatedUser()->get_id(),
'agreement' => $validation_datas->getAgreement(),
'updated_on' => $validation_datas->getUpdated()->format(DATE_ATOM),
'note' => $validation_datas->getNote(),
'note' => $validation_datas->getNote(),
);
if ($user->get_id() == $this->core->getAuthenticatedUser()->get_id()) {
@@ -1339,10 +1339,10 @@ class API_V1_adapter extends API_V1_Abstract
$per_page = (($per_page >= 1) && ($per_page <= 20)) ? $per_page : 5;
$datas = array(
'feed' => $this->list_publication($feed, $user),
'feed' => $this->list_publication($feed, $user),
'offset_start' => $offset_start,
'per_page' => $per_page,
'entries' => $this->list_publications_entries($feed, $offset_start, $per_page),
'per_page' => $per_page,
'entries' => $this->list_publications_entries($feed, $offset_start, $per_page),
);
$result->set_datas($datas);
@@ -1360,15 +1360,15 @@ class API_V1_adapter extends API_V1_Abstract
protected function list_publication(Feed_Adapter $feed, $user)
{
return array(
'id' => $feed->get_id(),
'title' => $feed->get_title(),
'subtitle' => $feed->get_subtitle(),
'id' => $feed->get_id(),
'title' => $feed->get_title(),
'subtitle' => $feed->get_subtitle(),
'total_entries' => $feed->get_count_total_entries(),
'icon' => $feed->get_icon_url(),
'public' => $feed->is_public(),
'is_mine' => $feed->is_owner($user),
'created_on' => $feed->get_created_on()->format(DATE_ATOM),
'updated_on' => $feed->get_updated_on()->format(DATE_ATOM),
'icon' => $feed->get_icon_url(),
'public' => $feed->is_public(),
'is_mine' => $feed->is_owner($user),
'created_on' => $feed->get_created_on()->format(DATE_ATOM),
'updated_on' => $feed->get_updated_on()->format(DATE_ATOM),
);
}
@@ -1392,7 +1392,7 @@ class API_V1_adapter extends API_V1_Abstract
return array(
'offset_start' => $offset_start
, 'entries' => $out
, 'entries' => $out
);
}
@@ -1411,12 +1411,12 @@ class API_V1_adapter extends API_V1_Abstract
return array(
'author_email' => $entry->get_author_email(),
'author_name' => $entry->get_author_name(),
'created_on' => $entry->get_created_on()->format(DATE_ATOM),
'updated_on' => $entry->get_updated_on()->format(DATE_ATOM),
'title' => $entry->get_title(),
'subtitle' => $entry->get_subtitle(),
'items' => $items,
'author_name' => $entry->get_author_name(),
'created_on' => $entry->get_created_on()->format(DATE_ATOM),
'updated_on' => $entry->get_updated_on()->format(DATE_ATOM),
'title' => $entry->get_title(),
'subtitle' => $entry->get_subtitle(),
'items' => $items,
);
}
@@ -1430,7 +1430,7 @@ class API_V1_adapter extends API_V1_Abstract
{
$datas = array(
'item_id' => $item->get_id()
, 'record' => $this->list_record($item->get_record())
, 'record' => $this->list_record($item->get_record())
);
return $datas;
@@ -1478,13 +1478,13 @@ class API_V1_adapter extends API_V1_Abstract
$permalink = null;
return array(
'permalink' => $permalink,
'height' => $media->get_height(),
'width' => $media->get_width(),
'filesize' => $media->get_size(),
'devices' => $media->getDevices(),
'permalink' => $permalink,
'height' => $media->get_height(),
'width' => $media->get_width(),
'filesize' => $media->get_size(),
'devices' => $media->getDevices(),
'player_type' => $media->get_type(),
'mime_type' => $media->get_mime(),
'mime_type' => $media->get_mime(),
);
}
@@ -1498,13 +1498,13 @@ class API_V1_adapter extends API_V1_Abstract
protected function list_permalink(media_Permalink_Adapter &$permalink, registryInterface &$registry)
{
return array(
'created_on' => $permalink->get_created_on()->format(DATE_ATOM),
'id' => $permalink->get_id(),
'is_activated' => $permalink->get_is_activated(),
'label' => $permalink->get_label(),
'created_on' => $permalink->get_created_on()->format(DATE_ATOM),
'id' => $permalink->get_id(),
'is_activated' => $permalink->get_is_activated(),
'label' => $permalink->get_label(),
'last_modified' => $permalink->get_last_modified()->format(DATE_ATOM),
'page_url' => $permalink->get_page($registry),
'url' => $permalink->get_url($registry)
'page_url' => $permalink->get_page($registry),
'url' => $permalink->get_url($registry)
);
}
@@ -1520,7 +1520,7 @@ class API_V1_adapter extends API_V1_Abstract
$status = strrev($status);
$ret = array();
foreach ($databox->get_statusbits() as $bit => $status_datas) {
$ret[$bit] = array('bit' => $bit, 'state' => ! ! substr($status, ($bit - 1), 1));
$ret[$bit] = array('bit' => $bit, 'state' => ! ! substr($status, ($bit - 1), 1));
}
return $ret;
@@ -1557,10 +1557,10 @@ class API_V1_adapter extends API_V1_Abstract
* dans un cas multi
*/
return array(
'meta_id' => $value->getId(),
'meta_id' => $value->getId(),
'meta_structure_id' => $field->get_meta_struct_id(),
'name' => $field->get_name(),
'value' => $value->getValue(),
'name' => $field->get_name(),
'value' => $value->getValue(),
);
}
@@ -1573,13 +1573,13 @@ class API_V1_adapter extends API_V1_Abstract
protected function list_basket(\Entities\Basket $basket)
{
$ret = array(
'created_on' => $basket->getCreated()->format(DATE_ATOM),
'description' => (string) $basket->getDescription(),
'name' => $basket->getName(),
'created_on' => $basket->getCreated()->format(DATE_ATOM),
'description' => (string) $basket->getDescription(),
'name' => $basket->getName(),
'pusher_usr_id' => $basket->getPusherId(),
'ssel_id' => $basket->getId(),
'updated_on' => $basket->getUpdated()->format(DATE_ATOM),
'unread' => ! $basket->getIsRead(),
'ssel_id' => $basket->getId(),
'updated_on' => $basket->getUpdated()->format(DATE_ATOM),
'unread' => ! $basket->getIsRead(),
);
if ($basket->getValidation()) {
@@ -1590,10 +1590,10 @@ class API_V1_adapter extends API_V1_Abstract
$user = $participant->getUser();
$users[$user->get_id()] = array(
'usr_id' => $user->get_id(),
'usr_name' => $user->get_display_name(),
'confirmed' => $participant->getIsConfirmed(),
'can_agree' => $participant->getCanAgree(),
'usr_id' => $user->get_id(),
'usr_name' => $user->get_display_name(),
'confirmed' => $participant->getIsConfirmed(),
'can_agree' => $participant->getCanAgree(),
'can_see_others' => $participant->getCanSeeOthers(),
);
}
@@ -1607,11 +1607,11 @@ class API_V1_adapter extends API_V1_Abstract
$ret = array_merge(
array(
'validation_users' => $users,
'validation_end_date' => $expires_on_atom,
'validation_infos' => $basket->getValidation()->getValidationString($user),
'validation_users' => $users,
'validation_end_date' => $expires_on_atom,
'validation_infos' => $basket->getValidation()->getValidationString($user),
'validation_confirmed' => $basket->getValidation()->getParticipant($user)->getIsConfirmed(),
'mine' => $basket->getValidation()->isInitiator($user),
'mine' => $basket->getValidation()->isInitiator($user),
), $ret
);
}
@@ -1628,21 +1628,21 @@ class API_V1_adapter extends API_V1_Abstract
protected function list_record(record_adapter $record)
{
return array(
'databox_id' => $record->get_sbas_id(),
'record_id' => $record->get_record_id(),
'mime_type' => $record->get_mime(),
'title' => $record->get_title(),
'original_name' => $record->get_original_name(),
'last_modification' => $record->get_modification_date()->format(DATE_ATOM),
'created_on' => $record->get_creation_date()->format(DATE_ATOM),
'collection_id' => phrasea::collFromBas($record->get_base_id()),
'sha256' => $record->get_sha256(),
'thumbnail' => $this->list_embedable_media(
'databox_id' => $record->get_sbas_id(),
'record_id' => $record->get_record_id(),
'mime_type' => $record->get_mime(),
'title' => $record->get_title(),
'original_name' => $record->get_original_name(),
'last_modification' => $record->get_modification_date()->format(DATE_ATOM),
'created_on' => $record->get_creation_date()->format(DATE_ATOM),
'collection_id' => phrasea::collFromBas($record->get_base_id()),
'sha256' => $record->get_sha256(),
'thumbnail' => $this->list_embedable_media(
$record->get_thumbnail(), registry::get_instance()
),
'technical_informations' => $record->get_technical_infos(),
'phrasea_type' => $record->get_type(),
'uuid' => $record->get_uuid(),
'phrasea_type' => $record->get_type(),
'uuid' => $record->get_uuid(),
);
}
@@ -1671,7 +1671,7 @@ class API_V1_adapter extends API_V1_Abstract
{
$ret = array();
foreach ($databox->get_cgus() as $locale => $array_terms) {
$ret[$locale] = array('locale' => $locale, 'terms' => $array_terms['value']);
$ret[$locale] = array('locale' => $locale, 'terms' => $array_terms['value']);
}
return $ret;
@@ -1719,9 +1719,9 @@ class API_V1_adapter extends API_V1_Abstract
protected function list_collection(collection $collection)
{
$ret = array(
'base_id' => $collection->get_base_id(),
'coll_id' => $collection->get_coll_id(),
'name' => $collection->get_name(),
'base_id' => $collection->get_base_id(),
'coll_id' => $collection->get_coll_id(),
'name' => $collection->get_name(),
'record_amount' => $collection->get_record_amount(),
);
@@ -1739,13 +1739,13 @@ class API_V1_adapter extends API_V1_Abstract
$ret = array();
foreach ($status as $n => $datas) {
$ret[$n] = array(
'bit' => $n,
'label_on' => $datas['labelon'],
'label_off' => $datas['labeloff'],
'img_on' => $datas['img_on'],
'img_off' => $datas['img_off'],
'bit' => $n,
'label_on' => $datas['labelon'],
'label_off' => $datas['labeloff'],
'img_on' => $datas['img_on'],
'img_off' => $datas['img_off'],
'searchable' => $datas['searchable'],
'printable' => $datas['printable'],
'printable' => $datas['printable'],
);
}
@@ -1777,18 +1777,18 @@ class API_V1_adapter extends API_V1_Abstract
protected function list_databox_metadata_field_properties(databox_field $databox_field)
{
$ret = array(
'id' => $databox_field->get_id(),
'namespace' => $databox_field->get_metadata_namespace(),
'source' => $databox_field->get_metadata_source(),
'tagname' => $databox_field->get_metadata_tagname(),
'name' => $databox_field->get_name(),
'separator' => $databox_field->get_separator(),
'id' => $databox_field->get_id(),
'namespace' => $databox_field->get_metadata_namespace(),
'source' => $databox_field->get_metadata_source(),
'tagname' => $databox_field->get_metadata_tagname(),
'name' => $databox_field->get_name(),
'separator' => $databox_field->get_separator(),
'thesaurus_branch' => $databox_field->get_tbranch(),
'type' => $databox_field->get_type(),
'indexable' => $databox_field->is_indexable(),
'multivalue' => $databox_field->is_multi(),
'readonly' => $databox_field->is_readonly(),
'required' => $databox_field->is_required(),
'type' => $databox_field->get_type(),
'indexable' => $databox_field->is_indexable(),
'multivalue' => $databox_field->is_multi(),
'readonly' => $databox_field->is_readonly(),
'required' => $databox_field->is_required(),
);
return $ret;

13
lib/classes/task/Scheduler.class.php
View File

@@ -23,6 +23,7 @@ class task_Scheduler
const METHOD_FORK = 'METHOD_FORK';
const METHOD_PROC_OPEN = 'METHOD_PROC_OPEN';
const ERR_ALREADY_RUNNING = 114; // aka EALREADY (Operation already in progress)
private $method;
private $input;
protected $output;
@@ -51,7 +52,7 @@ class task_Scheduler
return appbox::get_instance(\bootstrap::getCore())->get_connection();
}
public function run($input=null, OutputInterface $output = null)
public function run($input = null, OutputInterface $output = null)
{
require_once dirname(__FILE__) . '/../../bootstrap.php';
$this->input = $input;
@@ -249,12 +250,12 @@ class task_Scheduler
}
$taskPoll[$tkey] = array(
"task" => $task,
"task" => $task,
"current_status" => $status,
"cmd" => $cmd,
"args" => $args,
"killat" => null,
"sigterm_sent" => false
"cmd" => $cmd,
"args" => $args,
"killat" => null,
"sigterm_sent" => false
);
if ($this->method == self::METHOD_PROC_OPEN) {
$taskPoll[$tkey]['process'] = NULL;

26
lib/classes/task/abstract.class.php
View File

@@ -4,25 +4,21 @@ abstract class task_abstract
{
const LAUCHED_BY_BROWSER = 1;
const LAUCHED_BY_COMMANDLINE = 2;
const STATE_TOSTOP = 'tostop';
const STATE_STARTED = 'started';
const STATE_TOSTART = 'tostart';
const STATE_TORESTART = 'torestart';
const STATE_STOPPED = 'stopped';
const STATE_TODELETE = 'todelete';
const RUNNER_MANUAL = 'manual';
const RUNNER_SCHEDULER = 'scheduler';
const STATE_OK = 'STATE_OK';
const STATE_MAXMEGSREACHED = 'STATE_MAXMEGS';
const STATE_MAXRECSDONE = 'STATE_MAXRECS';
const STATE_FINISHED = 'STATE_FINISHED';
const SIGNAL_SCHEDULER_DIED = 'SIGNAL_SCHEDULER_DIED';
const ERR_ALREADY_RUNNING = 114; // aka EALREADY (Operation already in progress)
protected $suicidable = false;
protected $launched_by = 0;
@@ -94,7 +90,7 @@ abstract class task_abstract
protected $taskid = NULL;
protected $system = ''; // "DARWIN", "WINDOWS" , "LINUX"...
protected $argt = array(
"--help" => array("set" => false, "values" => array(), "usage" => " (no help available)")
"--help" => array("set" => false, "values" => array(), "usage" => " (no help available)")
);
public function getState()
@@ -172,7 +168,7 @@ abstract class task_abstract
$sql = 'UPDATE task2 SET name = :title WHERE task_id = :taskid';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':title' => $title, ':taskid' => $this->getID()));
$stmt->execute(array(':title' => $title, ':taskid' => $this->getID()));
$stmt->closeCursor();
$this->title = $title;
@@ -186,7 +182,7 @@ abstract class task_abstract
$sql = 'UPDATE task2 SET settings = :settings WHERE task_id = :taskid';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':settings' => $settings, ':taskid' => $this->getID()));
$stmt->execute(array(':settings' => $settings, ':taskid' => $this->getID()));
$stmt->closeCursor();
$this->settings = $settings;
@@ -390,7 +386,7 @@ abstract class task_abstract
$this->running = $stat;
}
protected function pause($when_started=0)
protected function pause($when_started = 0)
{
$this->log($this->records_done . ' records done');
if ($this->running) {// && $this->records_done == 0)
@@ -409,7 +405,7 @@ abstract class task_abstract
}
}
final public function run($runner, $input=null, $output = null)
final public function run($runner, $input = null, $output = null)
{
$this->input = $input;
$this->output = $output;
@@ -500,7 +496,7 @@ abstract class task_abstract
}
}
function traceRam($msg='')
function traceRam($msg = '')
{
static $lastt = null;
$t = explode(' ', ($ut = microtime()));
@@ -568,9 +564,9 @@ abstract class task_abstract
$settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tasksettings>\n</tasksettings>";
$params = array(
':active' => 1
, ':name' => $class_name::getName()
, ':class' => $class_name
':active' => 1
, ':name' => $class_name::getName()
, ':class' => $class_name
, ':settings' => $settings
);
$stmt = $appbox->get_connection()->prepare($sql);
@@ -605,7 +601,7 @@ abstract class task_abstract
$conn = connection::getPDOConnection();
$sql = 'UPDATE task2 SET completed = :p WHERE task_id = :taskid';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':p' => $p, ':taskid' => $this->getID()));
$stmt->execute(array(':p' => $p, ':taskid' => $this->getID()));
$stmt->closeCursor();
$this->completed_percentage = $p;
} catch (Exception $e) {

2
lib/classes/task/databoxAbstract.class.php
View File

@@ -62,7 +62,7 @@ abstract class task_databoxAbstract extends task_abstract
if ($this->mono_sbas_id) {
$sql = 'SELECT sbas_id, task2.* FROM sbas, task2 WHERE task_id=:taskid AND sbas_id=:sbas_id';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':taskid' => $this->getID(), ':sbas_id' => $this->mono_sbas_id));
$stmt->execute(array(':taskid' => $this->getID(), ':sbas_id' => $this->mono_sbas_id));
} else {
$sql = 'SELECT sbas_id, task2.* FROM sbas, task2 WHERE task_id = :taskid';
$stmt = $conn->prepare($sql);

2
lib/classes/task/manager.class.php
View File

@@ -171,7 +171,7 @@ class task_manager
try {
// $testclass = new $classname(null);
if ($classname::interfaceAvailable()) {
$tasks[] = array("class" => $classname, "name" => $classname::getName(), "err" => null);
$tasks[] = array("class" => $classname, "name" => $classname::getName(), "err" => null);
}
} catch (Exception $e) {

10
lib/classes/task/period/apibridge.class.php
View File

@@ -86,7 +86,7 @@ class task_period_apibridge extends task_appboxAbstract
$params = array(
':status' => Bridge_Element::STATUS_ERROR
, ':id' => $row['id']
, ':id' => $row['id']
);
$stmt = $appbox->get_connection()->prepare($sql);
@@ -160,11 +160,11 @@ class task_period_apibridge extends task_appboxAbstract
case Bridge_Element::STATUS_ERROR:
$params = array(
'usr_id' => $account->get_user()->get_id()
, 'reason' => $error_message
'usr_id' => $account->get_user()->get_id()
, 'reason' => $error_message
, 'account_id' => $account->get_id()
, 'sbas_id' => $element->get_record()->get_sbas_id()
, 'record_id' => $element->get_record()->get_record_id()
, 'sbas_id' => $element->get_record()->get_sbas_id()
, 'record_id' => $element->get_record()->get_record_id()
);
$events_mngr = eventsmanager_broker::getInstance(appbox::get_instance(\bootstrap::getCore()), $Core);
$events_mngr->trigger('__BRIDGE_UPLOAD_FAIL__', $params);

42
lib/classes/task/period/archive.class.php
View File

@@ -27,9 +27,9 @@ class task_period_archive extends task_abstract
* @var <type>
*/
protected $mimeTypes = array(
"jpg" => "image/jpeg",
"jpg" => "image/jpeg",
"jpeg" => "image/jpeg",
"pdf" => "application/pdf"
"pdf" => "application/pdf"
);
/**
@@ -219,27 +219,27 @@ class task_period_archive extends task_abstract
ob_start();
?>
<form name="graphicForm" onsubmit="return(false);" method="post">
<?php echo _('task::archive:archivage sur base/collection/') ?> :
<?php echo _('task::archive:archivage sur base/collection/') ?> :
<select onchange="chgxmlpopup(this, 'base_id');" name="base_id">
<option value="">...</option>
<?php
foreach ($appbox->get_databoxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
print("<option value=\"" . $collection->get_base_id() . "\">" . $databox->get_viewname() . " / " . $collection->get_name() . "</option>");
}
}
?>
<?php
foreach ($appbox->get_databoxes() as $databox) {
foreach ($databox->get_collections() as $collection) {
print("<option value=\"" . $collection->get_base_id() . "\">" . $databox->get_viewname() . " / " . $collection->get_name() . "</option>");
}
}
?>
</select>
<br/>
<br/>
<?php echo _('task::_common_:hotfolder') ?>
<?php echo _('task::_common_:hotfolder') ?>
<input type="text" name="hotfolder" style="width:400px;" onchange="chgxmltxt(this, 'hotfolder');" value=""><br/>
<br/>
<?php echo _('task::_common_:periodicite de la tache') ?>&nbsp;:&nbsp;
<?php echo _('task::_common_:periodicite de la tache') ?>&nbsp;:&nbsp;
<input type="text" name="period" style="width:40px;" onchange="chgxmltxt(this, 'period');" value="">&nbsp;<?php echo _('task::_common_:secondes (unite temporelle)') ?><br/>
<br/>
<?php echo _('task::archive:delai de \'repos\' avant traitement') ?>&nbsp;:&nbsp;
<?php echo _('task::archive:delai de \'repos\' avant traitement') ?>&nbsp;:&nbsp;
<input type="text" name="cold" style="width:40px;" onchange="chgxmltxt(this, 'cold');" value="">&nbsp;<?php echo _('task::_common_:secondes (unite temporelle)') ?><br/>
<br/>
<input type="checkbox" name="move_archived" onchange="chgxmlck(this, 'move_archived');">&nbsp;<?php echo _('task::archive:deplacer les fichiers archives dans _archived') ?>
@@ -335,23 +335,23 @@ class task_period_archive extends task_abstract
if ($this->sxTaskSettings->files && $this->sxTaskSettings->files->file) {
foreach ($this->sxTaskSettings->files->file as $ft)
$this->tmask[] = array(
"mask" => (string) $ft["mask"]
"mask" => (string) $ft["mask"]
, "caption" => (string) $ft["caption"]
, "accept" => (string) $ft["accept"]
, "accept" => (string) $ft["accept"]
);
}
if ($this->sxTaskSettings->files && $this->sxTaskSettings->files->grouping) {
foreach ($this->sxTaskSettings->files->grouping as $ft)
$this->tmaskgrp[] = array(
"mask" => (string) $ft["mask"]
, "caption" => (string) $ft["caption"]
"mask" => (string) $ft["mask"]
, "caption" => (string) $ft["caption"]
, "representation" => (string) $ft["representation"]
, "accept" => (string) $ft["accept"]
, "accept" => (string) $ft["accept"]
);
}
if (count($this->tmask) == 0) {
// no mask defined : accept all kind of files
$this->tmask[] = array("mask" => ".*", "caption" => "", "accept" => "");
$this->tmask[] = array("mask" => ".*", "caption" => "", "accept" => "");
}
// main loop
@@ -899,7 +899,7 @@ class task_period_archive extends task_abstract
// this group in new (to be created)
// do we need one (or both) linked file ? (caption or representation)
$err = false;
$flink = array('caption' => null, 'representation' => null);
$flink = array('caption' => null, 'representation' => null);
foreach ($flink as $linkName => $v) {
if (isset($grpSettings[$linkName]) && $grpSettings[$linkName] != '') {
@@ -1727,7 +1727,7 @@ class task_period_archive extends task_abstract
$params = array(
':rid_parent' => $grp_rid
, ':rid_child' => $rid
, ':rid_child' => $rid
);
$stmt = $connbas->prepare($sql);

2
lib/classes/task/period/batchupload.class.php
View File

@@ -126,7 +126,7 @@ class task_period_batchupload extends task_appboxAbstract
$sql = 'UPDATE uplbatch SET complete="2", error = :error'
. ' WHERE uplbatch_id = :batch_id';
$stmt = $conn->prepare($sql);
$stmt->execute(array(':error' => $errors, ':batch_id' => $batch_id));
$stmt->execute(array(':error' => $errors, ':batch_id' => $batch_id));
$stmt->closeCursor();
$this->log(sprintf(('finishing batch %s'), $row['uplbatch_id']));

15
lib/classes/task/period/cindexer.class.php
View File

@@ -17,13 +17,14 @@ class task_period_cindexer extends task_abstract
{
// how to execute indexer (choose in 'run2' method)
private $method;
const METHOD_FORK = 'METHOD_FORK';
const METHOD_EXEC = 'METHOD_EXEC';
const METHOD_PROC_OPEN = 'METHOD_PROC_OPEN';
const ERR_EXECUTABLE_NOT_FOUND = 2; // aka ENOENT (No such file or directory)
const ERR_CRASHED = 14; // aka EFAULT (Bad address)
const ERR_CANT_FORK = 3; // aka ESRCH (No such process)
/**
*
* @var string
@@ -278,7 +279,7 @@ class task_period_cindexer extends task_abstract
?>
<form name="graphicForm" onsubmit="return(false);" method="post">
<br/>
<?php echo _('task::cindexer:executable') ?>&nbsp;:&nbsp;
<?php echo _('task::cindexer:executable') ?>&nbsp;:&nbsp;
<input type="text" name="binpath" style="width:300px;" onchange="chgxmltxt(this, 'binpath');" value="">&nbsp;/&nbsp;<?php echo $appname ?>
<br/>
<?php echo _('task::cindexer:host') ?>&nbsp;:&nbsp;<input type="text" name="host" style="width:100px;" onchange="chgxmltxt(this, 'host');" value="">
@@ -289,13 +290,13 @@ class task_period_cindexer extends task_abstract
<br/>
<?php echo _('task::cindexer:user') ?>&nbsp;:&nbsp;<input type="text" name="user" style="width:200px;" onchange="chgxmltxt(this, 'user');" value="">
<br/>
<?php echo _('task::cindexer:password') ?>&nbsp;:&nbsp;<input type="password" name="password" style="width:200px;" onchange="chgxmltxt(this, 'password');" value="">
<?php echo _('task::cindexer:password') ?>&nbsp;:&nbsp;<input type="password" name="password" style="width:200px;" onchange="chgxmltxt(this, 'password');" value="">
<br/>
<br/>
<?php echo _('task::cindexer:control socket') ?>&nbsp;:&nbsp;<input type="text" name="socket" style="width:50px;" onchange="chgxmltxt(this, 'socket');" value="">
<br/>
<?php echo _('task::cindexer:Debug mask') ?>&nbsp;:&nbsp;<input type="text" name="debugmask" style="width:50px;" onchange="chgxmltxt(this, 'debugmask');" value="">
<?php echo _('task::cindexer:Debug mask') ?>&nbsp;:&nbsp;<input type="text" name="debugmask" style="width:50px;" onchange="chgxmltxt(this, 'debugmask');" value="">
<br/>
<br/>
@@ -304,20 +305,20 @@ class task_period_cindexer extends task_abstract
<br/>
</div>
<?php echo _('task::cindexer:MySQL charset') ?>&nbsp;:&nbsp;<input type="text" name="charset" style="width:100px;" onchange="chgxmltxt(this, 'charset');" value="">
<?php echo _('task::cindexer:MySQL charset') ?>&nbsp;:&nbsp;<input type="text" name="charset" style="width:100px;" onchange="chgxmltxt(this, 'charset');" value="">
<br/>
<input type="checkbox" name="nolog" onclick="chgxmlck(this, 'nolog');">&nbsp;<?php echo _('task::cindexer:do not (sys)log, but out to console)') ?>
<br/>
<?php echo _('task::cindexer:default language for new candidates') ?>&nbsp;:&nbsp;<input type="text" name="clng" style="width:50px;" onchange="chgxmltxt(this, 'clng');" value="">
<?php echo _('task::cindexer:default language for new candidates') ?>&nbsp;:&nbsp;<input type="text" name="clng" style="width:50px;" onchange="chgxmltxt(this, 'clng');" value="">
<br/>
<br/>
<hr/>
<br/>
<?php echo _('task::cindexer:windows specific') ?>&nbsp;:<br/>
<?php echo _('task::cindexer:windows specific') ?>&nbsp;:<br/>
<input type="checkbox" name="winsvc_run" onclick="chgxmlck(this, 'run');">&nbsp;<?php echo _('task::cindexer:run as application, not as service') ?>
<br/>

4
lib/classes/task/period/ftp.class.php
View File

@@ -460,7 +460,7 @@ class task_period_ftp extends task_appboxAbstract
$obj[] = array(
"name" => $subdef, "size" => filesize($localfile),
"name" => $subdef, "size" => filesize($localfile),
"shortXml" => ($sdcaption ? $sdcaption : '')
);
@@ -488,7 +488,7 @@ class task_period_ftp extends task_appboxAbstract
$sql = "UPDATE ftp_export_elements"
. " SET done = :done, error='1' WHERE id = :file_id";
$stmt = $conn->prepare($sql);
$stmt->execute(array(':done' => $done, ':file_id' => $file['id']));
$stmt->execute(array(':done' => $done, ':file_id' => $file['id']));
$stmt->closeCursor();
}
}

12
lib/classes/task/period/outofdate.class.php
View File

@@ -677,7 +677,7 @@ class task_period_outofdate extends task_abstract
. " SET " . $sqlset[0]
. " WHERE " . $w;
$ret[] = array('sql' => $sql, 'params' => $params);
$ret[] = array('sql' => $sql, 'params' => $params);
}
@@ -709,7 +709,7 @@ class task_period_outofdate extends task_abstract
. " SET " . $sqlset[1]
. " WHERE " . $w;
$ret[] = array('sql' => $sql, 'params' => $params);
$ret[] = array('sql' => $sql, 'params' => $params);
}
@@ -738,7 +738,7 @@ class task_period_outofdate extends task_abstract
. " SET " . $sqlset[2]
. " WHERE " . $w;
$ret[] = array('sql' => $sql, 'params' => $params);
$ret[] = array('sql' => $sql, 'params' => $params);
}
return($ret);
@@ -779,12 +779,12 @@ class task_period_outofdate extends task_abstract
foreach ($status as $n => $stat) {
$labelon = $stat['labelon'] ? $stat['labelon'] : ($n . '-ON');
$labeloff = $stat['labeloff'] ? $stat['labeloff'] : ($n . '-OFF');
$ret['status_bits'][] = array('n' => $n, 'value' => 0, 'label' => $labeloff);
$ret['status_bits'][] = array('n' => $n, 'value' => 1, 'label' => $labelon);
$ret['status_bits'][] = array('n' => $n, 'value' => 0, 'label' => $labeloff);
$ret['status_bits'][] = array('n' => $n, 'value' => 1, 'label' => $labelon);
}
foreach ($databox->get_collections() as $collection)
$ret['collections'][] = array('id' => $collection->get_coll_id(), 'name' => $collection->get_name());
$ret['collections'][] = array('id' => $collection->get_coll_id(), 'name' => $collection->get_name());
} catch (Exception $e) {
}

2
lib/classes/task/period/upgradetov31.class.php
View File

@@ -83,7 +83,7 @@ class task_period_upgradetov31 extends task_abstract
$sql = 'UPDATE record SET uuid = :uuid WHERE record_id = :record_id';
$params = array(
':uuid' => $uuid
':uuid' => $uuid
, ':record_id' => $row['record_id']
);
$stmt = $connbas->prepare($sql);

10
lib/classes/task/period/upgradetov32.class.php
View File

@@ -160,7 +160,7 @@ class task_period_upgradetov32 extends task_abstract
}
}
try {
$stmt_original->execute(array(':originalname' => $value, ':record_id' => $row['record_id']));
$stmt_original->execute(array(':originalname' => $value, ':record_id' => $row['record_id']));
} catch (Exception $e) {
}
@@ -200,8 +200,8 @@ class task_period_upgradetov32 extends task_abstract
$stmt->execute(array(
':record_id' => $record->get_record_id()
, ':name' => $name
, ':value' => $value
, ':name' => $name
, ':value' => $value
));
}
} catch (Exception $e) {
@@ -271,8 +271,8 @@ class task_period_upgradetov32 extends task_abstract
$metadatas[$databox_field->get_id()] = array(
'meta_struct_id' => $databox_field->get_id()
, 'meta_id' => null
, 'value' => $value
, 'meta_id' => null
, 'value' => $value
);
}
}

12
lib/classes/task/period/workflow01.class.php
View File

@@ -452,7 +452,7 @@ class task_period_workflow01 extends task_databoxAbstract
phrasea::headers(200, true, 'text/json', 'UTF-8', false);
$retjs = array('result' => NULL,
$retjs = array('result' => NULL,
'date_fields' => array(),
'status_bits' => array(),
'collections' => array()
@@ -471,18 +471,18 @@ class task_period_workflow01 extends task_databoxAbstract
foreach ($status as $n => $s) {
$retjs['status_bits'][] = array(
'n' => $n,
'value' => 0,
'label' => $s['labeloff'] ? $s['labeloff'] : 'non ' . $s['name']);
'n' => $n,
'value' => 0,
'label' => $s['labeloff'] ? $s['labeloff'] : 'non ' . $s['name']);
$retjs['status_bits'][] = array(
'n' => $n,
'n' => $n,
'value' => 1,
'label' => $s['labelon'] ? $s['labelon'] : $s['name']);
}
$base_ids = $user->ACL()->get_granted_base(array(), array($sbas_id));
foreach ($base_ids as $base_id => $collection) {
$retjs['collections'][] = array('id' => (string) ($collection->get_coll_id()), 'name' => $collection->get_name());
$retjs['collections'][] = array('id' => (string) ($collection->get_coll_id()), 'name' => $collection->get_name());
}
} catch (Exception $e) {

30
www/admin/adminFeedback.php
View File

@@ -190,11 +190,11 @@ switch ($parm['action']) {
}
$id = $task->getID();
$ret['tasks'][$id] = array(
'id' => $id
, 'pid' => $task->getPID()
, 'crashed' => $task->getCrashCounter()
'id' => $id
, 'pid' => $task->getPID()
, 'crashed' => $task->getCrashCounter()
, 'completed' => $task->getCompletedPercentage()
, 'status' => $task->getState()
, 'status' => $task->getState()
);
}
@@ -228,13 +228,13 @@ switch ($parm['action']) {
case 'P_BAR_INFO':
$parm = $request->get_parms(array('sbas_id' => http_request::SANITIZE_NUMBER_INT));
$ret = array(
'sbas_id' => null,
'indexable' => false,
'records' => 0,
'xml_indexed' => 0,
'sbas_id' => null,
'indexable' => false,
'records' => 0,
'xml_indexed' => 0,
'thesaurus_indexed' => 0,
'viewname' => null,
'printLogoURL' => NULL
'viewname' => null,
'printLogoURL' => NULL
);
$databox = databox::get_instance((int) $parm['sbas_id']);
@@ -260,7 +260,7 @@ switch ($parm['action']) {
case 'CHGVIEWNAME':
$parm = $request->get_parms('sbas_id', 'viewname');
$ret = array('sbas_id' => null, 'viewname' => null);
$ret = array('sbas_id' => null, 'viewname' => null);
$sbas_id = (int) $parm['sbas_id'];
$databox = databox::get_instance($sbas_id);
$appbox->set_databox_viewname($databox, $parm['viewname']);
@@ -270,7 +270,7 @@ switch ($parm['action']) {
case 'MAKEINDEXABLE':
$parm = $request->get_parms('sbas_id', 'INDEXABLE');
$ret = array('sbas_id' => null, 'indexable' => null);
$ret = array('sbas_id' => null, 'indexable' => null);
$sbas_id = (int) $parm['sbas_id'];
$databox = databox::get_instance($sbas_id);
$appbox->set_databox_indexable($databox, $parm['INDEXABLE']);
@@ -292,7 +292,7 @@ switch ($parm['action']) {
case 'CLEARALLLOG':
$parm = $request->get_parms(array('sbas_id' => http_request::SANITIZE_NUMBER_INT));
$ret = array('sbas_id' => null);
$ret = array('sbas_id' => null);
$sbas_id = (int) $parm['sbas_id'];
$databox = databox::get_instance($sbas_id);
$databox->clear_logs();
@@ -302,7 +302,7 @@ switch ($parm['action']) {
case 'DELLOGOPDF':
$parm = $request->get_parms(array('sbas_id' => http_request::SANITIZE_NUMBER_INT));
$ret = array('sbas_id' => null);
$ret = array('sbas_id' => null);
$sbas_id = (int) $parm['sbas_id'];
$databox = databox::get_instance($sbas_id);
$appbox->write_databox_pic($databox, null, databox::PIC_PDF);
@@ -314,7 +314,7 @@ switch ($parm['action']) {
case 'DELETEBASE':
$parm = $request->get_parms(array('sbas_id' => http_request::SANITIZE_NUMBER_INT));
$ret = array('sbas_id' => null, 'err' => -1, 'errmsg' => null);
$ret = array('sbas_id' => null, 'err' => -1, 'errmsg' => null);
try {
$sbas_id = (int) $parm['sbas_id'];

70
www/admin/task2utils.php
View File

@@ -56,16 +56,16 @@ phrasea::headers();
d.getElementById('linkviewgraph').className = "tabBack";
parent.jsTaskObj.currentView = "XML";
</script>
<?php
}
break;
<?php
}
break;
case 'XML2FORM':
if (method_exists($ztask, 'printInterfaceHTML')) {
if ((simplexml_load_string($parm['txtareaxml']))) {
if ($ztask->getGraphicForm()) {
if (($msg = ($ztask->xml2graphic($parm['txtareaxml'], "parent.document.forms['graphicForm']"))) == "") {
?>
case 'XML2FORM':
if (method_exists($ztask, 'printInterfaceHTML')) {
if ((simplexml_load_string($parm['txtareaxml']))) {
if ($ztask->getGraphicForm()) {
if (($msg = ($ztask->xml2graphic($parm['txtareaxml'], "parent.document.forms['graphicForm']"))) == "") {
?>
<script type="text/javascript">
var d = parent.document;
d.getElementById('divGraph').style.display = "";
@@ -80,10 +80,10 @@ phrasea::headers();
<script type="text/javascript">
alert("<?php echo p4string::MakeString($msg, 'js', '"') ?>");
</script>
<?php
}
} else {
?>
<?php
}
} else {
?>
<script type="text/javascript">
var d = parent.document;
d.getElementById('divGraph').style.display = "";
@@ -97,32 +97,32 @@ phrasea::headers();
} else {
?>
<script type="text/javascript">
if(confirm("<?php echo p4string::MakeString(_('admin::tasks: xml invalide, restaurer la version precedente ?'), 'js', '"') // xml invalide, restaurer la v. prec. ? ?>"))
if(confirm("<?php echo p4string::MakeString(_('admin::tasks: xml invalide, restaurer la version precedente ?'), 'js', '"') // xml invalide, restaurer la v. prec. ? ?>"))
parent.document.forms['fxml'].txtareaxml.value = parent.jsTaskObj.oldXML;
</script>
<?php
}
}
break;
case 'SAVE_GRAPHIC':
$parm['txtareaxml'] = $ztask->graphic2xml($parm['__xml']);
case 'SAVE_XML':
if ((simplexml_load_string($parm['txtareaxml']))) {
if (method_exists($ztask, 'checkXML')) {
if ($ztask->checkXML($parm['txtareaxml']) != '') {
return;
<?php
}
}
}
$task_manager = new task_manager($appbox);
$tid = $parm['__tid'];
$task = $task_manager->getTask($tid);
break;
$task->setActive($parm['__tactive']);
$task->setTitle($parm['__tname']);
$task->setSettings($parm['txtareaxml']);
?>
case 'SAVE_GRAPHIC':
$parm['txtareaxml'] = $ztask->graphic2xml($parm['__xml']);
case 'SAVE_XML':
if ((simplexml_load_string($parm['txtareaxml']))) {
if (method_exists($ztask, 'checkXML')) {
if ($ztask->checkXML($parm['txtareaxml']) != '') {
return;
}
}
$task_manager = new task_manager($appbox);
$tid = $parm['__tid'];
$task = $task_manager->getTask($tid);
$task->setActive($parm['__tactive']);
$task->setTitle($parm['__tname']);
$task->setSettings($parm['txtareaxml']);
?>
<script type="text/javascript">
parent.document.getElementById("taskid").innerHTML = "id : <?php echo $tid ?>";
if(o=parent.document.getElementById("__gtid"))