latest additions to fix_api script, planned to be used to port apps more or less automatic to use new api

This commit is contained in:
Ralf Becker 2016-04-06 20:04:32 +00:00
parent 341a56dc3d
commit 1afa2416ff

View File

@ -28,23 +28,48 @@ $replace = array(
"#\\\$GLOBALS\['egw'\]->session->appsession\(([^,]+),\s*('[^']+')\)#" => 'Api\\Cache::getSession($2, $1)', "#\\\$GLOBALS\['egw'\]->session->appsession\(([^,]+),\s*('[^']+')\)#" => 'Api\\Cache::getSession($2, $1)',
"#\\\$GLOBALS\['egw'\]->session->appsession\(([^,]+),\s*('[^']+'),\s*#" => 'Api\\Cache::setSession($2, $1, ', "#\\\$GLOBALS\['egw'\]->session->appsession\(([^,]+),\s*('[^']+'),\s*#" => 'Api\\Cache::setSession($2, $1, ',
"#\\\$GLOBALS\['egw'\]->common->#" => 'common::', "#\\\$GLOBALS\['egw'\]->common->#" => 'common::',
"#\\\$GLOBALS\['egw'\]->hooks->#" => 'Api\\Hooks::',
"#\\\$GLOBALS\['egw'\]->translation->#" => 'Api\\Translation::',
); );
// enclose class-names and static methods with some syntax check // enclose class-names and static methods with some syntax check
$class_start = '#([\[\s,;(])'; $class_start = '#([\[\s,;(])';
$class_end = '(::|\\(|;|\?|:|\\s|$)#'; $class_end = '(::|\\(|;|\?|:|\\s|$)#';
foreach(array( foreach(array(
'accounts' => 'Api\\Accounts', 'accounts' => 'Api\\Accounts',
//'acl' => 'Api\Acl', 'acl' => 'Api\\Acl',
//'applications' => 'Api\Applications', 'EGW_ACL_READ' => 'Api\\Acl::READ',
//'asyncservice' => 'Api\AsyncService', 'EGW_ACL_ADD' => 'Api\\Acl::ADD',
'EGW_ACL_EDIT' => 'Api\\Acl::EDIT',
'EGW_ACL_DELETE' => 'Api\\Acl::DELETE',
'EGW_ACL_PRIVATE' => 'Api\\Acl::PRIVAT',
'EGW_ACL_GROUP_MANAGERS' => 'Api\\Acl::GROUPMGRS',
'EGW_ACL_CUSTOM_1' => 'Api\\Acl::CUSTOM1',
'EGW_ACL_CUSTOM_2' => 'Api\\Acl::CUSTOM2',
'EGW_ACL_CUSTOM_3' => 'Api\\Acl::CUSTOM3',
//'applications' => 'Api\\Applications',
'asyncservice' => 'Api\\AsyncService',
'auth' => 'Api\\Auth', 'auth' => 'Api\\Auth',
'categories' => 'Api\\Categories', 'categories' => 'Api\\Categories',
'config::get_customfields' => 'Api\\Storage\\Customfields::get', 'config::get_customfields' => 'Api\\Storage\\Customfields::get',
'config' => 'Api\\Config', 'config' => 'Api\\Config',
'common::image' => 'Api\\Image::find', 'common::setlocale' => 'Api\\Preferences::setlocale',
'common::generate_uid' => 'Api\\CalDAV::generate_uid',
'common::ldap_addslashes' => 'Api\\Ldap::quote',
'common::ldapConnect' => 'Api\\Ldap::factory',
'common::egw_exit' => 'exit', 'common::egw_exit' => 'exit',
//'common' list single methods like 'common::randomstring' => 'Api\\Auth::randomstring',
//'country' => 'Api\\Country', 'common::display_fullname' => 'Api\\Accounts::format_username',
'common::grab_owner_name' => 'Api\\Accounts::username',
'common::find_image' => 'Api\\Image::find',
'common::image' => 'Api\\Image::find',
'common::svg_usable' => 'Api\\Image::svg_usable',
'common::image_map' => 'Api\\Image::map',
'common::delete_image_map' => 'Api\\Image::invalidate',
'common::transliterate' => 'Api\\Translation::to_ascii',
'common::email_address' => 'Api\\Accounts::email',
'common::next_id' => 'Api\\Accounts\\Ldap::next_id',
'common::last_id' => 'Api\\Accounts\\Ldap::last_id',
'country' => 'Api\\Country',
//'egw' => //'egw' =>
'egw_cache' => 'Api\\Cache', 'egw_cache' => 'Api\\Cache',
'egw_ckeditor_config' => 'Api\\Html\\CkEditorConfig', 'egw_ckeditor_config' => 'Api\\Html\\CkEditorConfig',
@ -65,18 +90,19 @@ foreach(array(
'egw_exception_redirect' => 'Api\\Exception\\Redirect', 'egw_exception_redirect' => 'Api\\Exception\\Redirect',
//'egw_favorites' => //'egw_favorites' =>
//'egw_framework' => //'egw_framework' =>
//'egw_ical_iterator' =>
'egw_json_request' => 'Api\\Json\\Request', 'egw_json_request' => 'Api\\Json\\Request',
'egw_json_response' => 'Api\\Json\\Response', 'egw_json_response' => 'Api\\Json\\Response',
'egw_link' => 'Api\\Link', 'egw_link' => 'Api\\Link',
//'egw_mailer' => 'egw_mailer' => 'Api\\Mailer',
'egw_session' => 'Api\\Session', 'egw_session' => 'Api\\Session',
//'egw_tail' => 'egw_tail' => 'Api\\Json\\Tail',
'egw_time' => 'Api\\DateTime', 'egw_time' => 'Api\\DateTime',
'egw_vfs' => 'Api\\Vfs', 'egw_vfs' => 'Api\\Vfs',
//'groupdav*' => 'groupdav' => 'Api\CalDAV',
'groupdav_principal' => 'Api\\CalDAV\\Principal',
'groupdav_handler' => 'Api\\CalDAV\\Handler',
'egw_ical_iterator' => 'Api\\CalDAV\\IcalIterator',
'historylog' => 'Api\\Storage\\History', 'historylog' => 'Api\\Storage\\History',
//'hooks' =>
'html::\$user_agent' => 'Api\\Header\\UserAgent::type()', 'html::\$user_agent' => 'Api\\Header\\UserAgent::type()',
'html::\$ua_version' => 'Api\\Header\\UserAgent::version()', 'html::\$ua_version' => 'Api\\Header\\UserAgent::version()',
'html::\$ua_mobile' => 'Api\\Header\\UserAgent::mobile()', 'html::\$ua_mobile' => 'Api\\Header\\UserAgent::mobile()',
@ -90,7 +116,13 @@ foreach(array(
'solink' => 'Api\\Link\\Storage', 'solink' => 'Api\\Link\\Storage',
'sqlfs_stream_wrapper' => 'Api\\Vfs\\Sqlfs\\StreamWrapper', 'sqlfs_stream_wrapper' => 'Api\\Vfs\\Sqlfs\\StreamWrapper',
'sqlfs_utils' => 'Api\\Vfs\\Sqlfs\\Utils', 'sqlfs_utils' => 'Api\\Vfs\\Sqlfs\\Utils',
// todo translation mail specific stuff 'translation::decodeMailHeader' => 'Api\\Mail\\Html::decodeMailHeader',
'translation::replaceEmailAdresses' => 'Api\\Mail\\Html::replaceEmailAdresses',
'translation::replaceTagsCompletley' => 'Api\\Mail\\Html::replaceTagsCompletley',
'translation::transform_mailto2text' => 'Api\\Mail\\Html::transform_mailto2text',
'translation::transform_url2text' => 'Api\\Mail\\Html::transform_url2text',
'translation::convertHTMLToText' => 'Api\\Mail\\Html::convertHTMLToText',
'translation::splithtmlByPRE' => 'Api\\Mail\\Html::splithtmlByPRE',
'translation' => 'Api\\Translation', 'translation' => 'Api\\Translation',
// etemplate2 // etemplate2
'etemplate_new' => 'Api\\Etemplate', 'etemplate_new' => 'Api\\Etemplate',
@ -110,7 +142,7 @@ foreach(array(
'so_sql_cf' => 'Api\\Storage', 'so_sql_cf' => 'Api\\Storage',
'so_sql2' => 'Api\\Storage\\Base2', 'so_sql2' => 'Api\\Storage\\Base2',
'bo_tracking' => 'Api\\Storage\\Tracking', 'bo_tracking' => 'Api\\Storage\\Tracking',
//'bo_merge' => 'bo_merge' => 'Api\\Storage\\Merge',
// addressbook backend // addressbook backend
'addressbook_bo' => 'Api\\Contacts', 'addressbook_bo' => 'Api\\Contacts',
'addressbook_so' => 'Api\\Contacts\\Storage', 'addressbook_so' => 'Api\\Contacts\\Storage',