From 75833b0274c4c536ab92f7735f74ef141094554d Mon Sep 17 00:00:00 2001 From: Laurent Opprecht Date: Fri, 15 Jun 2012 10:01:53 +0200 Subject: [PATCH] see #4554: move shibboleth classes to their namespace, remove redirect bug, remove conf --- .hgignore | 1 + main/inc/lib/autoload.class.php | 52 ++++++++++++++++----------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.hgignore b/.hgignore index c8e6684aca..d38c5901c6 100644 --- a/.hgignore +++ b/.hgignore @@ -115,6 +115,7 @@ searchdb/* main/inc/cache/* test_laurent.php *.orig +main/auth/shibboleth/config.php syntax: regexp ^main/upload/users$ diff --git a/main/inc/lib/autoload.class.php b/main/inc/lib/autoload.class.php index 55d55daf83..513ff4af95 100644 --- a/main/inc/lib/autoload.class.php +++ b/main/inc/lib/autoload.class.php @@ -62,9 +62,7 @@ class Autoload $result['Accessurledituserstourl'] = '/main/inc/lib/access_url_edit_users_to_url_functions.lib.php'; $result['AddCourseToSession'] = '/main/inc/lib/add_courses_to_session_functions.lib.php'; $result['AddManySessionToCategoryFunctions'] = '/main/inc/lib/add_many_session_to_category_functions.lib.php'; - $result['Admin'] = '/main/auth/shibboleth/app/model/admin.class.php'; $result['AdminPage'] = '/main/admin/admin_page.class.php'; - $result['AdminStore'] = '/main/auth/shibboleth/app/model/admin.class.php'; $result['Agenda'] = '/main/calendar/agenda.lib.php'; $result['Announcement'] = '/main/coursecopy/classes/Announcement.class.php'; $result['AnnouncementEmail'] = '/main/announcements/announcement_email.class.php'; @@ -129,7 +127,6 @@ class Autoload $result['DataForm'] = '/main/gradebook/lib/fe/dataform.class.php'; $result['Debug'] = '/main/inc/lib/debug.lib.php'; $result['Diagnoser'] = '/main/inc/lib/diagnoser.lib.php'; - $result['Diagnosis'] = '/main/inc/lib/doctor/diagnosis.class.php'; $result['Display'] = '/main/inc/lib/display.lib.php'; $result['Document'] = '/main/coursecopy/classes/Document.class.php'; $result['DocumentManager'] = '/main/inc/lib/document.lib.php'; @@ -143,9 +140,9 @@ class Autoload $result['EvalLink'] = '/main/gradebook/lib/be/evallink.class.php'; $result['Evaluation'] = '/main/gradebook/lib/be/evaluation.class.php'; $result['Event'] = '/main/coursecopy/classes/Event.class.php'; - $result['EventsMail'] = '/main/inc/lib/events_email.class.php'; - $result['EventsDispatcher'] = '/main/inc/lib/events_dispatcher.class.php'; $result['EventEmailTemplate'] = '/main/inc/lib/event_email_template.class.php'; + $result['EventsDispatcher'] = '/main/inc/lib/events_dispatcher.class.php'; + $result['EventsMail'] = '/main/inc/lib/events_email.class.php'; $result['Exercise'] = '/main/exercice/exercise.class.php'; $result['ExerciseLink'] = '/main/gradebook/lib/be/exerciselink.class.php'; $result['ExerciseResult'] = '/main/exercice/exercise_result.class.php'; @@ -239,14 +236,12 @@ class Autoload $result['Header'] = '/main/inc/lib/system/web/header.class.php'; $result['HotSpot'] = '/main/exercice/hotspot.class.php'; $result['HotSpotDelineation'] = '/main/exercice/hotspot.class.php'; - $result['Html'] = '/main/inc/lib/html.class.php'; $result['Html_Quickform_Rule_Date'] = '/main/inc/lib/pear/HTML/QuickForm/Rule/Date.php'; $result['HttpResource'] = '/main/inc/lib/external_media/renderer/http_resource.class.php'; $result['Image'] = '/main/inc/lib/image.lib.php'; $result['ImageWrapper'] = '/main/inc/lib/image.lib.php'; $result['ImagickWrapper'] = '/main/inc/lib/image.lib.php'; $result['Import'] = '/main/inc/lib/import.lib.php'; - $result['InactiveCourseReport'] = '/main/admin/inactive_course_report.class.php'; $result['IndexManager'] = '/main/inc/lib/userportal.lib.php'; $result['IndexableChunk'] = '/main/inc/lib/search/IndexableChunk.class.php'; $result['Install'] = '/main/install/install.class.php'; @@ -263,6 +258,7 @@ class Autoload $result['LoginRedirection'] = '/main/inc/lib/login_redirection.class.php'; $result['Matching'] = '/main/exercice/matching.class.php'; $result['MessageManager'] = '/main/inc/lib/message.lib.php'; + $result['Model'] = '/main/inc/lib/model.lib.php'; $result['Model\Course'] = '/main/inc/lib/course.class.php'; $result['Model\Document'] = '/main/inc/lib/document.class.php'; $result['Model\ItemProperty'] = '/main/inc/lib/item_property.class.php'; @@ -319,28 +315,40 @@ class Autoload $result['Request'] = '/main/inc/lib/system/web/request.class.php'; $result['RequestServer'] = '/main/inc/lib/system/web/request_server.class.php'; $result['Resource'] = '/main/coursecopy/classes/Resource.class.php'; + $result['Response'] = '/main/inc/lib/response.class.php'; $result['Result'] = '/main/gradebook/lib/be/result.class.php'; $result['ResultSet'] = '/main/inc/lib/result_set.class.php'; $result['ResultTable'] = '/main/gradebook/lib/fe/resulttable.class.php'; $result['ResultsDataGenerator'] = '/main/gradebook/lib/results_data_generator.class.php'; $result['Rights'] = '/main/inc/lib/rights.lib.php'; - $result['Scaffolder'] = '/main/auth/shibboleth/lib/scaffolder/scaffolder.class.php'; $result['ScoreDisplay'] = '/main/gradebook/lib/scoredisplay.class.php'; $result['ScoreDisplayForm'] = '/main/gradebook/lib/fe/scoredisplayform.class.php'; $result['ScormDocument'] = '/main/coursecopy/classes/ScormDocument.class.php'; $result['Security'] = '/main/inc/lib/security.lib.php'; $result['SessionHandler'] = '/main/inc/lib/session_handler.class.php'; $result['SessionManager'] = '/main/inc/lib/sessionmanager.lib.php'; - $result['Shibboleth'] = '/main/auth/shibboleth/app/shibboleth.class.php'; - $result['ShibbolethConfig'] = '/main/auth/shibboleth/lib/shibboleth_config.class.php'; - $result['ShibbolethController'] = '/main/auth/shibboleth/app/controller/shibboleth_controller.class.php'; - $result['ShibbolethDisplay'] = '/main/auth/shibboleth/app/view/shibboleth_display.class.php'; - $result['ShibbolethEmailForm'] = '/main/auth/shibboleth/app/view/shibboleth_email_form.class.php'; - $result['ShibbolethSession'] = '/main/auth/shibboleth/lib/shibboleth_session.class.php'; - $result['ShibbolethStatusRequestForm'] = '/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php'; - $result['ShibbolethStore'] = '/main/auth/shibboleth/app/model/shibboleth_store.class.php'; - $result['ShibbolethUpgrade'] = '/main/auth/shibboleth/db/shibboleth_upgrade.class.php'; - $result['ShibbolethUser'] = '/main/auth/shibboleth/app/model/shibboleth_user.class.php'; + $result['Shibboleth\Admin'] = '/main/auth/shibboleth/app/model/admin.class.php'; + $result['Shibboleth\AdminStore'] = '/main/auth/shibboleth/app/model/admin.class.php'; + $result['Shibboleth\Model'] = '/main/auth/shibboleth/lib/model.class.php'; + $result['Shibboleth\Scaffolder'] = '/main/auth/shibboleth/lib/scaffolder/scaffolder.class.php'; + $result['Shibboleth\Shibboleth'] = '/main/auth/shibboleth/app/shibboleth.class.php'; + $result['Shibboleth\ShibbolethConfig'] = '/main/auth/shibboleth/lib/shibboleth_config.class.php'; + $result['Shibboleth\ShibbolethController'] = '/main/auth/shibboleth/app/controller/shibboleth_controller.class.php'; + $result['Shibboleth\ShibbolethDisplay'] = '/main/auth/shibboleth/app/view/shibboleth_display.class.php'; + $result['Shibboleth\ShibbolethEmailForm'] = '/main/auth/shibboleth/app/view/shibboleth_email_form.class.php'; + $result['Shibboleth\ShibbolethSession'] = '/main/auth/shibboleth/lib/shibboleth_session.class.php'; + $result['Shibboleth\ShibbolethStatusRequestForm'] = '/main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php'; + $result['Shibboleth\ShibbolethStore'] = '/main/auth/shibboleth/app/model/shibboleth_store.class.php'; + $result['Shibboleth\ShibbolethUpgrade'] = '/main/auth/shibboleth/db/shibboleth_upgrade.class.php'; + $result['Shibboleth\ShibbolethUser'] = '/main/auth/shibboleth/app/model/shibboleth_user.class.php'; + $result['Shibboleth\Store'] = '/main/auth/shibboleth/lib/store.class.php'; + $result['Shibboleth\User'] = '/main/auth/shibboleth/app/model/user.class.php'; + $result['Shibboleth\UserStore'] = '/main/auth/shibboleth/app/model/user.class.php'; + $result['Shibboleth\_Admin'] = '/main/auth/shibboleth/app/model/scaffold/admin.class.php'; + $result['Shibboleth\_AdminStore'] = '/main/auth/shibboleth/app/model/scaffold/admin.class.php'; + $result['Shibboleth\_User'] = '/main/auth/shibboleth/app/model/scaffold/user.class.php'; + $result['Shibboleth\_UserStore'] = '/main/auth/shibboleth/app/model/scaffold/user.class.php'; + $result['Shibboleth\aai'] = '/main/auth/shibboleth/config/aai.class.php'; $result['Skill'] = '/main/inc/lib/skill.lib.php'; $result['SkillProfile'] = '/main/inc/lib/skill.lib.php'; $result['SkillRelGradebook'] = '/main/inc/lib/skill.lib.php'; @@ -361,7 +369,6 @@ class Autoload $result['Spreadsheet_Excel_Writer_Workbook'] = '/main/inc/lib/pear/Spreadsheet_Excel_Writer/Writer/Workbook.php'; $result['Spreadsheet_Excel_Writer_Worksheet'] = '/main/inc/lib/pear/Spreadsheet_Excel_Writer/Writer/Worksheet.php'; $result['Statistics'] = '/main/admin/statistics/statistics.lib.php'; - $result['Store'] = '/main/auth/shibboleth/lib/store.class.php'; $result['StudentPublicationLink'] = '/main/gradebook/lib/be/studentpublicationlink.class.php'; $result['SubLanguageManager'] = '/main/admin/sub_language.class.php'; $result['Survey'] = '/main/coursecopy/classes/Survey.class.php'; @@ -409,13 +416,11 @@ class Autoload $result['UniqueAnswerNoOption'] = '/main/exercice/unique_answer_no_option.class.php'; $result['Uri'] = '/main/inc/lib/uri.class.php'; $result['UrlManager'] = '/main/inc/lib/urlmanager.lib.php'; - $result['User'] = '/main/auth/shibboleth/app/model/user.class.php'; $result['UserApiKeyManager'] = '/main/inc/lib/user_api_key_manager.class.php'; $result['UserDataGenerator'] = '/main/gradebook/lib/user_data_generator.class.php'; $result['UserForm'] = '/main/gradebook/lib/fe/userform.class.php'; $result['UserGroup'] = '/main/inc/lib/usergroup.lib.php'; $result['UserManager'] = '/main/inc/lib/usermanager.lib.php'; - $result['UserStore'] = '/main/auth/shibboleth/app/model/user.class.php'; $result['UserTable'] = '/main/gradebook/lib/fe/usertable.class.php'; $result['Utf8'] = '/main/inc/lib/system/text/utf8.class.php'; $result['Utf8Decoder'] = '/main/inc/lib/system/text/utf8_decoder.class.php'; @@ -425,12 +430,7 @@ class Autoload $result['Zip'] = '/main/inc/lib/zip.class.php'; $result['ZombieManager'] = '/main/inc/lib/zombie/zombie_manager.class.php'; $result['ZombieReport'] = '/main/inc/lib/zombie/zombie_report.class.php'; - $result['_Admin'] = '/main/auth/shibboleth/app/model/scaffold/admin.class.php'; - $result['_AdminStore'] = '/main/auth/shibboleth/app/model/scaffold/admin.class.php'; $result['_IndexableChunk'] = '/main/inc/lib/search/IndexableChunk.class.php'; - $result['_User'] = '/main/auth/shibboleth/app/model/scaffold/user.class.php'; - $result['_UserStore'] = '/main/auth/shibboleth/app/model/scaffold/user.class.php'; - $result['aai'] = '/main/auth/shibboleth/config/aai.class.php'; $result['aicc'] = '/main/newscorm/aicc.class.php'; $result['aiccBlock'] = '/main/newscorm/aiccBlock.class.php'; $result['aiccItem'] = '/main/newscorm/aiccItem.class.php';