From: <be...@us...> - 2012-01-31 15:44:40
|
Revision: 8845 http://xoops.svn.sourceforge.net/xoops/?rev=8845&view=rev Author: beckmi Date: 2012-01-31 15:44:25 +0000 (Tue, 31 Jan 2012) Log Message: ----------- Updating to 2.35 Beta 2 (JJDai) Modified Paths: -------------- XoopsModules/extcal/branches/jjdai/extcal/admin/about.php XoopsModules/extcal/branches/jjdai/extcal/admin/admin_footer.php XoopsModules/extcal/branches/jjdai/extcal/admin/admin_header.php XoopsModules/extcal/branches/jjdai/extcal/admin/cat.php XoopsModules/extcal/branches/jjdai/extcal/admin/event.php XoopsModules/extcal/branches/jjdai/extcal/admin/index.php XoopsModules/extcal/branches/jjdai/extcal/admin/menu.php XoopsModules/extcal/branches/jjdai/extcal/admin/perm.php XoopsModules/extcal/branches/jjdai/extcal/class/ExtcalPersistableObjectHandler.php XoopsModules/extcal/branches/jjdai/extcal/class/cat.php XoopsModules/extcal/branches/jjdai/extcal/class/event.php XoopsModules/extcal/branches/jjdai/extcal/class/eventmember.php XoopsModules/extcal/branches/jjdai/extcal/class/eventnotmember.php XoopsModules/extcal/branches/jjdai/extcal/class/file.php XoopsModules/extcal/branches/jjdai/extcal/class/form/formdatetime.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Calendar.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Day.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Decorator/Textual.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Decorator/Uri.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Decorator/Weekday.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Decorator/Wrapper.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Decorator.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Engine/Interface.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Engine/PearDate.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Engine/UnixTS.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Factory.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Hour.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Minute.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Month/Weekdays.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Month/Weeks.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Month.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Second.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Table/Helper.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Util/Textual.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Util/Uri.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Validator.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Week.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/Year.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/docs/examples/4.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/docs/examples/4.phps XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/docs/examples/index.html XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/tests/helper_test.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/tests/hour_test.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/tests/minute_test.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/tests/peardate_engine_test.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/tests/unixts_engine_test.php XoopsModules/extcal/branches/jjdai/extcal/class/pear/Calendar/tests/validator_unit_test.php XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt XoopsModules/extcal/branches/jjdai/extcal/docs/todo.txt XoopsModules/extcal/branches/jjdai/extcal/download_attachement.php XoopsModules/extcal/branches/jjdai/extcal/edit_event.php XoopsModules/extcal/branches/jjdai/extcal/event.php XoopsModules/extcal/branches/jjdai/extcal/event_member.php XoopsModules/extcal/branches/jjdai/extcal/event_notmember.php XoopsModules/extcal/branches/jjdai/extcal/include/agenda_fnc.php XoopsModules/extcal/branches/jjdai/extcal/include/constantes.php XoopsModules/extcal/branches/jjdai/extcal/include/functions.php XoopsModules/extcal/branches/jjdai/extcal/include/install_function.php XoopsModules/extcal/branches/jjdai/extcal/include/notification.inc.php XoopsModules/extcal/branches/jjdai/extcal/include/search.inc.php XoopsModules/extcal/branches/jjdai/extcal/include/style.css XoopsModules/extcal/branches/jjdai/extcal/include/update_function.php XoopsModules/extcal/branches/jjdai/extcal/js/graphics/controlbar-white.gif XoopsModules/extcal/branches/jjdai/extcal/js/highslide-full.packed.js XoopsModules/extcal/branches/jjdai/extcal/js/highslide-with-gallery.packed.js XoopsModules/extcal/branches/jjdai/extcal/js/highslide-with-html.packed.js XoopsModules/extcal/branches/jjdai/extcal/js/highslide.packed.js XoopsModules/extcal/branches/jjdai/extcal/language/english/admin.php XoopsModules/extcal/branches/jjdai/extcal/language/english/blocks.php XoopsModules/extcal/branches/jjdai/extcal/language/english/help/help.html XoopsModules/extcal/branches/jjdai/extcal/language/english/main.php XoopsModules/extcal/branches/jjdai/extcal/language/english/modinfo.php XoopsModules/extcal/branches/jjdai/extcal/language/french/admin.php XoopsModules/extcal/branches/jjdai/extcal/language/french/blocks.php XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt XoopsModules/extcal/branches/jjdai/extcal/language/french/help/extcal_help.html XoopsModules/extcal/branches/jjdai/extcal/language/french/help/help.html XoopsModules/extcal/branches/jjdai/extcal/language/french/main.php XoopsModules/extcal/branches/jjdai/extcal/language/french/modinfo.php XoopsModules/extcal/branches/jjdai/extcal/language/spanish/admin.php XoopsModules/extcal/branches/jjdai/extcal/language/spanish/blocks.php XoopsModules/extcal/branches/jjdai/extcal/language/spanish/help/help.html XoopsModules/extcal/branches/jjdai/extcal/language/spanish/main.php XoopsModules/extcal/branches/jjdai/extcal/language/spanish/modinfo.php XoopsModules/extcal/branches/jjdai/extcal/new_event.php XoopsModules/extcal/branches/jjdai/extcal/post.php XoopsModules/extcal/branches/jjdai/extcal/print.php XoopsModules/extcal/branches/jjdai/extcal/rss.php XoopsModules/extcal/branches/jjdai/extcal/sql/mysql.sql XoopsModules/extcal/branches/jjdai/extcal/templates/blocks/extcal_block_minical.html XoopsModules/extcal/branches/jjdai/extcal/templates/blocks/extcal_block_upcoming.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_navbar.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_day.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_month.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_search.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_week.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_year.html XoopsModules/extcal/branches/jjdai/extcal/versions/extcal_2_15.php XoopsModules/extcal/branches/jjdai/extcal/versions/extcal_2_28.php XoopsModules/extcal/branches/jjdai/extcal/view_agenda-day.php XoopsModules/extcal/branches/jjdai/extcal/view_agenda-week.php XoopsModules/extcal/branches/jjdai/extcal/view_calendar-month.php XoopsModules/extcal/branches/jjdai/extcal/view_calendar-week.php XoopsModules/extcal/branches/jjdai/extcal/view_day.php XoopsModules/extcal/branches/jjdai/extcal/view_month.php XoopsModules/extcal/branches/jjdai/extcal/view_search.php XoopsModules/extcal/branches/jjdai/extcal/view_week.php XoopsModules/extcal/branches/jjdai/extcal/view_year.php XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php Added Paths: ----------- XoopsModules/extcal/branches/jjdai/extcal/admin/etablissement.php XoopsModules/extcal/branches/jjdai/extcal/blocks/catetogy_events.php XoopsModules/extcal/branches/jjdai/extcal/blocks/day_events.php XoopsModules/extcal/branches/jjdai/extcal/blocks/minical.php XoopsModules/extcal/branches/jjdai/extcal/blocks/new_events.php XoopsModules/extcal/branches/jjdai/extcal/blocks/random_events.php XoopsModules/extcal/branches/jjdai/extcal/blocks/spotlight_events.php XoopsModules/extcal/branches/jjdai/extcal/blocks/upcoming.php XoopsModules/extcal/branches/jjdai/extcal/class/etablissement.php XoopsModules/extcal/branches/jjdai/extcal/class/extDateTime.php XoopsModules/extcal/branches/jjdai/extcal/class/tableForm.php XoopsModules/extcal/branches/jjdai/extcal/etablissement.php XoopsModules/extcal/branches/jjdai/extcal/header.php XoopsModules/extcal/branches/jjdai/extcal/images/horloges/ XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge01.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge02.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge03.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge04.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge05.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge06.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge08.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge09.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge10.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge11.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge12.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge14.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge15.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge16.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge17.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge18.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge19.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge20.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge21.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge23.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge24.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge27.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge31.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/horloge33.swf XoopsModules/extcal/branches/jjdai/extcal/images/horloges/index.html XoopsModules/extcal/branches/jjdai/extcal/images/icons/32/etablissement.png XoopsModules/extcal/branches/jjdai/extcal/include/mail_fnc.php XoopsModules/extcal/branches/jjdai/extcal/js/extcal_highslide.js XoopsModules/extcal/branches/jjdai/extcal/language/english/help/extcal_help.html XoopsModules/extcal/branches/jjdai/extcal/language/french/mail_inscription.html XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/ XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/admin.php XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/blocks.php XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/changelog.txt XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/help/ XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/help/extcal_help.html XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/help/help.html XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/help/index.html XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/index.html XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/mail_inscription.html XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/mail_template/ XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/mail_template/cat_new_event.tpl XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/mail_template/global_new_event.tpl XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/mail_template/global_new_event_pending.tpl XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/main.php XoopsModules/extcal/branches/jjdai/extcal/language/french_iso/modinfo.php XoopsModules/extcal/branches/jjdai/extcal/language/spanish/help/extcal_help.html XoopsModules/extcal/branches/jjdai/extcal/templates/admin/ XoopsModules/extcal/branches/jjdai/extcal/templates/admin/extcal_admin_cat_list.html XoopsModules/extcal/branches/jjdai/extcal/templates/admin/index.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_buttons_event.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_etablissement.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_horloge.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_imgXoops.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_mail_invitation.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_mail_member_html.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_mail_member_text.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_multiUploads.html XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_new-event.html XoopsModules/extcal/branches/jjdai/extcal/versions/extcal_2_33.php XoopsModules/extcal/branches/jjdai/extcal/versions/extcal_2_34.php XoopsModules/extcal/branches/jjdai/extcal/versions/extcal_2_35.php XoopsModules/extcal/branches/jjdai/extcal/view_new-event.php Removed Paths: ------------- XoopsModules/extcal/branches/jjdai/extcal/_extcal.ppr XoopsModules/extcal/branches/jjdai/extcal/admin/venue.php XoopsModules/extcal/branches/jjdai/extcal/blocks/extcal_blocks.php XoopsModules/extcal/branches/jjdai/extcal/class/venue.php XoopsModules/extcal/branches/jjdai/extcal/images/icons/32/venue.png XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_venue.html XoopsModules/extcal/branches/jjdai/extcal/venue.php Deleted: XoopsModules/extcal/branches/jjdai/extcal/_extcal.ppr =================================================================== --- XoopsModules/extcal/branches/jjdai/extcal/_extcal.ppr 2012-01-30 22:48:03 UTC (rev 8844) +++ XoopsModules/extcal/branches/jjdai/extcal/_extcal.ppr 2012-01-31 15:44:25 UTC (rev 8845) @@ -1,441 +0,0 @@ -[Config] -Compilator.SaveAll=0 -Compilator.Capture=0 -Compilator.HideOutput=0 -Compilator.LogType=0 -DefaultDir=F:\wamp\www\x250fra02\modules\extcal -DefaultCPIndex=0 -LogtoEnd=1 -DontOpen=0 -AbsolutePath=0 -FileFormat=0 -ProjectFilesOnly=0 -[Project tree] -_extcal - +extcal - -admin - admin\about.php - admin\admin_footer.php - admin\admin_header.php - admin\cat.php - admin\venue.php - admin\event.php - admin\index.html - admin\index.php - admin\menu.php - admin\perm.php - admin\upgrade.php - -blocks - blocks\extcal_blocks.php - blocks\index.html - -class - -form - class\form\extcalform.php - class\form\formdatetime.php - class\form\formfilecheckbox.php - class\form\formrecurrules.php - class\form\formrrulecheckbox.php - class\form\index.html - -pear - -Calendar - -Decorator - class\pear\Calendar\Decorator\Textual.php - class\pear\Calendar\Decorator\Uri.php - class\pear\Calendar\Decorator\Weekday.php - class\pear\Calendar\Decorator\Wrapper.php - -docs - -examples - class\pear\Calendar\docs\examples\1.php - class\pear\Calendar\docs\examples\1.phps - class\pear\Calendar\docs\examples\10.php - class\pear\Calendar\docs\examples\10.phps - class\pear\Calendar\docs\examples\11.php - class\pear\Calendar\docs\examples\11.phps - class\pear\Calendar\docs\examples\12.php - class\pear\Calendar\docs\examples\12.phps - class\pear\Calendar\docs\examples\13.php - class\pear\Calendar\docs\examples\13.phps - class\pear\Calendar\docs\examples\14.php - class\pear\Calendar\docs\examples\14.phps - class\pear\Calendar\docs\examples\15.php - class\pear\Calendar\docs\examples\15.phps - class\pear\Calendar\docs\examples\16.php - class\pear\Calendar\docs\examples\16.phps - class\pear\Calendar\docs\examples\17.php - class\pear\Calendar\docs\examples\17.phps - class\pear\Calendar\docs\examples\18.php - class\pear\Calendar\docs\examples\18.phps - class\pear\Calendar\docs\examples\19.php - class\pear\Calendar\docs\examples\19.phps - class\pear\Calendar\docs\examples\2.php - class\pear\Calendar\docs\examples\2.phps - class\pear\Calendar\docs\examples\20.php - class\pear\Calendar\docs\examples\20.phps - class\pear\Calendar\docs\examples\21.php - class\pear\Calendar\docs\examples\21.phps - class\pear\Calendar\docs\examples\22.php - class\pear\Calendar\docs\examples\22.phps - class\pear\Calendar\docs\examples\23.php - class\pear\Calendar\docs\examples\23.phps - class\pear\Calendar\docs\examples\3.php - class\pear\Calendar\docs\examples\3.phps - class\pear\Calendar\docs\examples\4.php - class\pear\Calendar\docs\examples\4.phps - class\pear\Calendar\docs\examples\5.php - class\pear\Calendar\docs\examples\5.phps - class\pear\Calendar\docs\examples\6.php - class\pear\Calendar\docs\examples\6.phps - class\pear\Calendar\docs\examples\7.php - class\pear\Calendar\docs\examples\7.phps - class\pear\Calendar\docs\examples\8.php - class\pear\Calendar\docs\examples\8.phps - class\pear\Calendar\docs\examples\9.php - class\pear\Calendar\docs\examples\9.phps - class\pear\Calendar\docs\examples\index.html - class\pear\Calendar\docs\Readme - -Engine - class\pear\Calendar\Engine\Interface.php - class\pear\Calendar\Engine\PearDate.php - class\pear\Calendar\Engine\UnixTS.php - -Month - class\pear\Calendar\Month\Weekdays.php - class\pear\Calendar\Month\Weeks.php - -Table - class\pear\Calendar\Table\Helper.php - -tests - class\pear\Calendar\tests\all_tests.php - class\pear\Calendar\tests\calendar_engine_tests.php - class\pear\Calendar\tests\calendar_include.php - class\pear\Calendar\tests\calendar_tabular_tests.php - class\pear\Calendar\tests\calendar_test.php - class\pear\Calendar\tests\calendar_tests.php - class\pear\Calendar\tests\day_test.php - class\pear\Calendar\tests\decorator_test.php - class\pear\Calendar\tests\decorator_tests.php - class\pear\Calendar\tests\decorator_textual_test.php - class\pear\Calendar\tests\decorator_uri_test.php - class\pear\Calendar\tests\helper_test.php - class\pear\Calendar\tests\hour_test.php - class\pear\Calendar\tests\minute_test.php - class\pear\Calendar\tests\month_test.php - class\pear\Calendar\tests\month_weekdays_test.php - class\pear\Calendar\tests\month_weeks_test.php - class\pear\Calendar\tests\peardate_engine_test.php - class\pear\Calendar\tests\README - class\pear\Calendar\tests\second_test.php - class\pear\Calendar\tests\simple_include.php - class\pear\Calendar\tests\table_helper_tests.php - class\pear\Calendar\tests\unixts_engine_test.php - class\pear\Calendar\tests\util_tests.php - class\pear\Calendar\tests\util_textual_test.php - class\pear\Calendar\tests\util_uri_test.php - class\pear\Calendar\tests\validator_error_test.php - class\pear\Calendar\tests\validator_tests.php - class\pear\Calendar\tests\validator_unit_test.php - class\pear\Calendar\tests\week_firstday_0_test.php - class\pear\Calendar\tests\week_test.php - class\pear\Calendar\tests\year_test.php - -Util - class\pear\Calendar\Util\Textual.php - class\pear\Calendar\Util\Uri.php - class\pear\Calendar\Calendar.php - class\pear\Calendar\Day.php - class\pear\Calendar\Decorator.php - class\pear\Calendar\Factory.php - class\pear\Calendar\Hour.php - class\pear\Calendar\Minute.php - class\pear\Calendar\Month.php - class\pear\Calendar\Second.php - class\pear\Calendar\Validator.php - class\pear\Calendar\Week.php - class\pear\Calendar\Year.php - class\cat.php - class\config.php - class\venue.php - class\event.php - class\eventmember.php - class\eventnotmember.php - class\ExtcalPersistableObjectHandler.php - class\file.php - class\index.html - class\pclerror.lib.php - class\pcltar.lib.php - class\pcltrace.lib.php - class\perm.php - class\time.php - -css - css\index.html - +docs - docs\changelog.txt - docs\credits.txt - docs\index.html - docs\install.txt - docs\JJD-todo.txt - docs\lang_diff.txt - docs\licence.txt - docs\readme.txt - docs\todo.txt - -images - -arrows - images\arrows\next.png - images\arrows\previous.png - images\arrows\Thumbs.db - -icons - -32 - images\icons\32\venue.png - images\icons\32\index.html - images\icons\addevent.gif - images\icons\event-end.gif - images\icons\event-middle.gif - images\icons\event-single.gif - images\icons\event-start.gif - images\icons\extcal.gif - images\icons\index.html - images\icons\minus.gif - images\icons\plus.gif - images\icons\rss.gif - images\icons\Thumbs.db - images\bubble.png - images\extcal_logo.png - images\index.html - images\left_both.gif - images\modadminbg.gif - images\right_both.gif - images\Thumbs.db - images\trame.png - +include - include\AC_RunActiveContent.js - include\admin.js - include\agenda_fnc.php - include\constantes.php - include\functions.php - include\index.html - include\install_function.php - include\notification.inc.php - include\search.inc.php - include\SlideShow.swf - include\style.css - include\ToolTips.js - include\update_function.php - -js - -graphics - -outlines - js\graphics\outlines\beveled.png - js\graphics\outlines\drop-shadow.png - js\graphics\outlines\glossy-dark.png - js\graphics\outlines\outer-glow.png - js\graphics\outlines\Outlines.psd - js\graphics\outlines\rounded-black.png - js\graphics\outlines\rounded-white.png - js\graphics\close.png - js\graphics\closeX.png - js\graphics\controlbar2.gif - js\graphics\controlbar3.gif - js\graphics\controlbar4.gif - js\graphics\controlbar4-hover.gif - js\graphics\controlbar-black-border.gif - js\graphics\controlbar-text-buttons.png - js\graphics\controlbar-white.gif - js\graphics\controlbar-white-small.gif - js\graphics\fullexpand.gif - js\graphics\geckodimmer.png - js\graphics\icon.gif - js\graphics\loader.gif - js\graphics\loader.white.gif - js\graphics\resize.gif - js\graphics\scrollarrows.png - js\graphics\zoomin.cur - js\graphics\zoomout.cur - js\highslide.css - js\highslide.js - js\highslide.min.js - js\highslide.packed.js - js\highslide-full.js - js\highslide-full.min.js - js\highslide-full.packed.js - js\highslide-ie6.css - js\highslide-with-gallery.js - js\highslide-with-gallery.min.js - js\highslide-with-gallery.packed.js - js\highslide-with-html.js - js\highslide-with-html.min.js - js\highslide-with-html.packed.js - +language - +english - -help - language\english\help\help.html - language\english\help\index.html - -mail_template - language\english\mail_template\cat_new_event.tpl - language\english\mail_template\global_new_event.tpl - language\english\mail_template\global_new_event_pending.tpl - language\english\admin.php - language\english\blocks.php - language\english\index.html - language\english\main.php - language\english\modinfo.php - +french - -help - language\french\help\extcal_help.html - language\french\help\help.html - language\french\help\index.html - -mail_template - language\french\mail_template\cat_new_event.tpl - language\french\mail_template\global_new_event.tpl - language\french\mail_template\global_new_event_pending.tpl - language\french\admin.php - language\french\blocks.php - language\french\changelog.txt - language\french\index.html - language\french\main.php - language\french\modinfo.php - +spanish - -help - language\spanish\help\help.html - language\spanish\help\index.html - -mail_template - language\spanish\mail_template\cat_new_event.tpl - language\spanish\mail_template\global_new_event.tpl - language\spanish\mail_template\global_new_event_pending.tpl - language\spanish\mail_template\index.html - language\spanish\admin.php - language\spanish\blocks.php - language\spanish\index.html - language\spanish\main.php - language\spanish\modinfo.php - language\index.html - -sql - sql\index.html - sql\mysql.sql - +templates - -blocks - templates\blocks\extcal_block_day.html - templates\blocks\extcal_block_minical.html - templates\blocks\extcal_block_new.html - templates\blocks\extcal_block_random.html - templates\blocks\extcal_block_spotlight.html - templates\blocks\extcal_block_upcoming.html - templates\blocks\extcal_block_upcomingByCategory.html - templates\blocks\index.html - templates\extcal_categorie.html - templates\extcal_venue.html - templates\extcal_event.html - templates\extcal_event_list1.html - templates\extcal_event_nav_btn.html - templates\extcal_info_bulle.html - templates\extcal_navbar.html - templates\extcal_post.html - templates\extcal_rss.html - templates\extcal_view_agenda-day.html - templates\extcal_view_agenda-week.html - templates\extcal_view_calendar-month.html - templates\extcal_view_calendar-week.html - templates\extcal_view_day.html - templates\extcal_view_month.html - templates\extcal_view_search.html - templates\extcal_view_week.html - templates\extcal_view_year.html - templates\index.html - -test - test\_extCalTestSuite - test\AddCategory - test\AddEventByAdmin - test\AddEventFrontEnd - test\DeleteEventAdmin - test\DeleteEventFrontEnd - test\EditEvent - test\index.html - test\readme.txt - test\ViewEvent - +versions - versions\extcal_2_04.php - versions\extcal_2_15.php - versions\extcal_2_21.php - versions\extcal_2_28.php - versions\extcal_3_00.php - versions\index.html - _extcal.ppr - comment_delete.php - comment_edit.php - comment_new.php - comment_post.php - comment_reply.php - download_attachement.php - edit_event.php - venue.php - event.php - event_member.php - event_notmember.php - index.php - new_event.php - notification_update.php - post.php - print.php - rss.php - upgrade.txt - view_agenda-day.php - view_agenda-week.php - view_calendar-month.php - view_calendar-week.php - view_day.php - view_month.php - view_search.php - view_week.php - view_year.php - xoops_version.php -[Open project files] -0=zzzzzzzzzzz.txt -1=include\update_function.php -2=class\event.php -3=view_search.php -4=templates\extcal_view_search.html -5=language\french\main.php -6=templates\extcal_event_list1.html -7=include\functions.php -8=include\agenda_fnc.php -9=..\_temp\xoops.sql\xoops.sql -10=templates\extcal_categorie.html -11=docs\changelog.txt -12=class\perm.php -[Selected Project Files] -Main= -Selected=class\event.php -[zzzzzzzzzzz.txt] -TopLine=76 -Caret=1,102 -[include\update_function.php] -TopLine=10 -Caret=33,24 -[class\event.php] -TopLine=1878 -Caret=21,1905 -[view_search.php] -TopLine=70 -Caret=41,95 -[templates\extcal_view_search.html] -TopLine=41 -Caret=51,62 -[language\french\main.php] -TopLine=168 -Caret=1,183 -[templates\extcal_event_list1.html] -TopLine=1 -Caret=1,4 -[include\functions.php] -TopLine=126 -Caret=1,153 -[include\agenda_fnc.php] -TopLine=191 -Caret=14,178 -[..\_temp\xoops.sql\xoops.sql] -TopLine=138 -Caret=1,168 -[templates\extcal_categorie.html] -TopLine=1 -Caret=58,5 -[docs\changelog.txt] -TopLine=1 -Caret=1,15 -[class\perm.php] -TopLine=11 -Caret=37,27 Modified: XoopsModules/extcal/branches/jjdai/extcal/admin/about.php =================================================================== --- XoopsModules/extcal/branches/jjdai/extcal/admin/about.php 2012-01-30 22:48:03 UTC (rev 8844) +++ XoopsModules/extcal/branches/jjdai/extcal/admin/about.php 2012-01-31 15:44:25 UTC (rev 8845) @@ -17,7 +17,9 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '/admin_header.php'; +include '../../../include/cp_header.php'; +include '../../../class/xoopsformloader.php'; +include 'admin_header.php'; xoops_cp_header(); @@ -25,4 +27,7 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -include 'admin_footer.php'; \ No newline at end of file +include 'admin_footer.php'; + + +?> Modified: XoopsModules/extcal/branches/jjdai/extcal/admin/admin_footer.php =================================================================== --- XoopsModules/extcal/branches/jjdai/extcal/admin/admin_footer.php 2012-01-30 22:48:03 UTC (rev 8844) +++ XoopsModules/extcal/branches/jjdai/extcal/admin/admin_footer.php 2012-01-31 15:44:25 UTC (rev 8845) @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license} + * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license * @package:: extCal * @subpackage:: admin * @since: 2.5.0 @@ -18,11 +18,9 @@ * @version:: $Id $ **/ -echo "<div class='adminfooter'>\n" - ." <div style='text-align: center;'>\n" - ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" - ." </div>\n" - ." " . _AM_ADMIN_FOOTER . "\n" - ."</div>"; +echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>"; +echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"; + xoops_cp_footer(); +?> Modified: XoopsModules/extcal/branches/jjdai/extcal/admin/admin_header.php =================================================================== --- XoopsModules/extcal/branches/jjdai/extcal/admin/admin_header.php 2012-01-30 22:48:03 UTC (rev 8844) +++ XoopsModules/extcal/branches/jjdai/extcal/admin/admin_header.php 2012-01-31 15:44:25 UTC (rev 8845) @@ -25,29 +25,46 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------ // -$path = dirname(dirname(dirname(dirname(__FILE__)))); -include_once $path . '/mainfile.php'; -include_once $path . '/include/cp_functions.php'; -require_once $path . '/include/cp_header.php'; +include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; +include_once XOOPS_ROOT_PATH . '/include/cp_functions.php'; +//include("../../../include/cp_header.php"); -global $xoopsModule; +if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); + //return true; + }else{ + echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks"); + //return false; + } -$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); +$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); +$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); +$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); -//if functions.php file exist -require_once dirname(dirname(__FILE__)) . '/include/functions.php'; +$myts =& MyTextSanitizer::getInstance(); -// Load language files -xoops_loadLanguage('admin', $thisModuleDir); -xoops_loadLanguage('modinfo', $thisModuleDir); -xoops_loadLanguage('main', $thisModuleDir); +if ($xoopsUser) { + $moduleperm_handler =& xoops_gethandler('groupperm'); + if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) { + redirect_header(XOOPS_URL, 1, _NOPERM); + exit(); + } +} else { +// redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM); +// exit(); +} -$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); -$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); -$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $xoopsTpl = new XoopsTpl(); +} -if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ - include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); - }else{ - redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); - } \ No newline at end of file +$xoopsTpl->assign('pathImageIcon', $pathImageIcon); + +//xoops_cp_header(); + +//Load languages +xoops_loadLanguage('admin', $xoopsModule->getVar("dirname")); +xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname")); +xoops_loadLanguage('main', $xoopsModule->getVar("dirname")); +?> Modified: XoopsModules/extcal/branches/jjdai/extcal/admin/cat.php =================================================================== --- XoopsModules/extcal/branches/jjdai/extcal/admin/cat.php 2012-01-30 22:48:03 UTC (rev 8844) +++ XoopsModules/extcal/branches/jjdai/extcal/admin/cat.php 2012-01-31 15:44:25 UTC (rev 8845) @@ -3,37 +3,44 @@ include '../../../include/cp_header.php'; include '../../../class/xoopsformloader.php'; include 'admin_header.php'; -include 'function.php'; - -if (isset($_GET['op'])) { - $op = $_GET['op']; -} else { - $op = 'default'; +include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php') ; +include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php') ; + +$gepeto = array_merge($_GET, $_POST); +while (list($k,$v) = each ($gepeto)){ + $$k = $v; } +if (!isset($op)) $op = ''; +// $t=print_r($gepeto,true); +// echo "<pre>{$t}</pre>"; + + switch($op) { case 'enreg': // Modify cat - if(isset($_POST['cat_id'])) { - $catHandler = xoops_getmodulehandler('cat', 'extcal'); + if(isset($cat_id)) { + $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); $varArr = array( - 'cat_name'=>$_POST['cat_name'], - 'cat_desc'=>$_POST['cat_desc'], - 'cat_color'=>substr($_POST['cat_color'],1) + 'cat_name'=>$cat_name, + 'cat_desc'=>$cat_desc, + 'cat_weight'=>$cat_weight, + 'cat_color'=>substr($cat_color,1) ); - $catHandler->modifyCat($_POST['cat_id'], $varArr); + $catHandler->modifyCat($cat_id, $varArr); redirect_header("cat.php", 3, _AM_EXTCAL_CAT_EDITED, false); // Create new cat } else { - $catHandler = xoops_getmodulehandler('cat', 'extcal'); + $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); $varArr = array( - 'cat_name'=>$_POST['cat_name'], - 'cat_desc'=>$_POST['cat_desc'], - 'cat_color'=>substr($_POST['cat_color'],1) + 'cat_name'=>$cat_name, + 'cat_desc'=>$cat_desc, + 'cat_weight'=>$cat_weight, + 'cat_color'=>substr($cat_color,1) ); $catHandler->createCat($varArr); redirect_header("cat.php", 3, _AM_EXTCAL_CAT_CREATED, false); @@ -41,111 +48,186 @@ break; - case 'modify': + case 'new': - if (isset($_POST['form_modify'])) { + xoops_cp_header(); + + $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true); + $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255), true); + $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', ''), false); + $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false); + $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color',"#FF0000")); + $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false); + $form->display(); + + + + include 'admin_footer.php'; + break; + + case 'edit': xoops_cp_header(); -// // @author Gregory Mage (Aka Mage) -// //*************************************************************************************** -// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php"; -// $categoryAdmin = new ModuleAdmin(); -// echo $categoryAdmin->addNavigation('cat.php'); - //*************************************************************************************** - $catHandler = xoops_getmodulehandler('cat', 'extcal'); - $cat = $catHandler->getCat($_POST['cat_id'], true); + $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); + if ($cat_id <> 0){ + $cat = $catHandler->getCat($cat_id, true); + }else{ + $cat = $catHandler->getCat($cat_id, true); + } + echo'<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>'; $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true); $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true); $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false); + $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false); $form->addElement( new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color')) ); $form->addElement(new XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false); - $form->addElement(new XoopsFormButton("", "form_submit", _SUBMIT, "submit"), false); + $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false); $form->display(); echo '</fieldset>'; xoops_cp_footer(); + break; + + case 'delete': + if (!isset($confirm)) { + xoops_cp_header(); + $hiddens = array('cat_id' => $cat_id, 'form_delete' => '', 'confirm' => 1); + xoops_confirm($hiddens, 'cat.php?op=delete', _AM_EXTCAL_CONFIRM_DELETE_CAT, _DELETE, 'cat.php'); + + xoops_cp_footer(); } else { - if (isset($_POST['form_delete'])) { - if (!isset($_POST['confirm'])) { - xoops_cp_header(); - // @author Gregory Mage (Aka Mage) - //*************************************************************************************** - include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php"; - $categoryAdmin = new ModuleAdmin(); - echo $categoryAdmin->addNavigation('cat.php'); - //*************************************************************************************** - - $hiddens = array('cat_id' => $_POST['cat_id'], 'form_delete' => '', 'confirm' => 1); - xoops_confirm($hiddens, 'cat.php?op=modify', _AM_EXTCAL_CONFIRM_DELETE_CAT, _DELETE, 'cat.php'); - - xoops_cp_footer(); - } else { - if (isset($_POST['confirm']) && $_POST['confirm'] == 1) { - $catHandler = xoops_getmodulehandler('cat', 'extcal'); - $catHandler->deleteCat($_POST['cat_id']); - redirect_header("cat.php", 3, _AM_EXTCAL_CAT_DELETED, false); - } - } + if (isset($confirm) && $confirm == 1) { + $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); + $catHandler->deleteCat($cat_id); + redirect_header("cat.php", 3, _AM_EXTCAL_CAT_DELETED, false); } } - break; - case 'default': +// case 'modify': +// +// if (isset($form_modify)) { +// xoops_cp_header(); +// +// $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); +// $cat = $catHandler->getCat($cat_id, true); +// +// echo'<fieldset><legend style="font-weight:bold; color:#990000;">' +// . _AM_EXTCAL_EDIT_CATEGORY . '</legend>'; +// +// $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true); +// $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true); +// $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false); +// $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false); +// $form->addElement( +// new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', +// '#' . $cat->getVar('cat_color')) +// ); +// $form->addElement(new XoopsFormHidden('cat_id', $cat->getVar('cat_id')), false); +// $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false); +// $form->display(); +// +// echo '</fieldset>'; +// +// xoops_cp_footer(); +// } else { +// if (isset($form_delete)) { +// if (!isset($confirm)) { +// xoops_cp_header(); +// // @author Gregory Mage (Aka Mage) +// //*************************************************************************************** +// include_once XOOPS_ROOT_PATH . "/modules/extcal/class/admin.php"; +// $categoryAdmin = new ModuleAdmin(); +// echo $categoryAdmin->addNavigation('cat.php'); +// //*************************************************************************************** +// +// $hiddens = array('cat_id' => $cat_id, 'form_delete' => '', 'confirm' => 1); +// xoops_confirm($hiddens, 'cat.php?op=modify', _AM_EXTCAL_CONFIRM_DELETE_CAT, _DELETE, 'cat.php'); +// +// xoops_cp_footer(); +// } else { +// if (isset($confirm) && $confirm == 1) { +// $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); +// $catHandler->deleteCat($cat_id); +// redirect_header("cat.php", 3, _AM_EXTCAL_CAT_DELETED, false); +// } +// } +// } +// } +// +// break; +// +// +// case 'default': +// +// xoops_cp_header(); +// // @author Gregory Mage (Aka Mage) +// //*************************************************************************************** +// $categoryAdmin = new ModuleAdmin(); +// echo $categoryAdmin->addNavigation('cat.php'); +// //*************************************************************************************** +// +// $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); +// $cats = $catHandler->getAllCat($xoopsUser, 'all'); +// +// +// echo'<fieldset><legend style="font-weight:bold; color:#990000;">' +// . _AM_EXTCAL_EDIT_OR_DELETE_CATEGORY . '</legend>'; +// $form = new XoopsThemeForm(_AM_EXTCAL_EDIT_OR_DELETE_CATEGORY, 'mod_cat', 'cat.php?op=modify', 'post', true); +// $catSelect = new XoopsFormSelect(_AM_EXTCAL_CATEGORY, 'cat_id'); +// +// foreach ( +// $cats as $cat +// ) { +// $catSelect->addOption($cat->getVar('cat_id'), $cat->getVar('cat_name')); +// } +// +// $form->addElement($catSelect, true); +// $button = new XoopsFormElementTray(''); +// $button->addElement(new XoopsFormButton("", "form_modify", _EDIT, "submit"), false); +// $button->addElement(new XoopsFormButton("", "form_delete", _DELETE, "submit"), false); +// $form->addElement($button, false); +// $form->display(); +// +// +// echo '</fieldset><br />'; +// echo'<fieldset><legend style="font-weight:bold; color:#990000;">' +// . _AM_EXTCAL_ADD_CATEGORY . '</legend>'; +// +// $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true); +// $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255), true); +// $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', ''), false); +// $form->addElement(new XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false); +// $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color')); +// $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false); +// $form->display(); +// +// echo '</fieldset><br />'; +// +// include 'admin_footer.php'; +// +// break; + + + case 'list': default: - xoops_cp_header(); - // @author Gregory Mage (Aka Mage) - //*************************************************************************************** - $categoryAdmin = new ModuleAdmin(); - echo $categoryAdmin->addNavigation('cat.php'); - //*************************************************************************************** + + $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); + $cats =$catHandler->getAllCatById($xoopsUser); - $catHandler = xoops_getmodulehandler('cat', 'extcal'); - $cats = $catHandler->getAllCat($xoopsUser, 'all'); - - - echo'<fieldset><legend style="font-weight:bold; color:#990000;">' - . _AM_EXTCAL_EDIT_OR_DELETE_CATEGORY . '</legend>'; - $form = new XoopsThemeForm(_AM_EXTCAL_EDIT_OR_DELETE_CATEGORY, 'mod_cat', 'cat.php?op=modify', 'post', true); - $catSelect = new XoopsFormSelect(_AM_EXTCAL_CATEGORY, 'cat_id'); - - foreach ( - $cats as $cat - ) { - $catSelect->addOption($cat->getVar('cat_id'), $cat->getVar('cat_name')); - } - - $form->addElement($catSelect, true); - $button = new XoopsFormElementTray(''); - $button->addElement(new XoopsFormButton("", "form_modify", _EDIT, "submit"), false); - $button->addElement(new XoopsFormButton("", "form_delete", _DELETE, "submit"), false); - $form->addElement($button, false); - $form->display(); - - - echo '</fieldset><br />'; - echo'<fieldset><legend style="font-weight:bold; color:#990000;">' - . _AM_EXTCAL_ADD_CATEGORY . '</legend>'; - - $form = new XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true); - $form->addElement(new XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255), true); - $form->addElement(new XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', ''), false); - $form->addElement(new XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color')); - $form->addElement(new XoopsFormButton("", "form_submit", _SUBMIT, "submit"), false); - $form->display(); - - echo '</fieldset><br />'; - - include 'admin_footer.php'; - + $xoopsTpl->assign("cats", $cats); + //$xoopsTpl->assign("module_dirname", $xoopsModule->getVar("dirname") ); + + $xoopsTpl->display("db:admin/extcal_admin_cat_list.html"); + include "admin_footer.php"; break; } Added: XoopsModules/extcal/branches/jjdai/extcal/admin/etablissement.php =================================================================== --- XoopsModules/extcal/branches/jjdai/extcal/admin/etablissement.php (rev 0) +++ XoopsModules/extcal/branches/jjdai/extcal/admin/etablissement.php 2012-01-31 15:44:25 UTC (rev 8845) @@ -0,0 +1,251 @@ +<?php +/** + * **************************************************************************** + * - TDMAds By TDM - TEAM DEV MODULE FOR XOOPS + * - Licence PRO Copyright (c) (http://www.tdmxoops.net) + * + * Cette licence, contient des limitations!!! + * + * 1. Vous devez posséder une permission d'exécuter le logiciel, pour n'importe quel usage. + * 2. Vous ne devez pas l' étudier, + * 3. Vous ne devez pas le redistribuer ni en faire des copies, + * 4. Vous n'avez pas la liberté de l'améliorer et de rendre publiques les modifications + * + * @license TDMFR PRO license + * @author TDMFR ; TEAM DEV MODULE + * + * **************************************************************************** + */ + +// Include xoops admin header +include_once '../../../include/cp_header.php'; +include_once XOOPS_ROOT_PATH.'/modules/extcal/class/ExtcalPersistableObjectHandler.php'; +include_once(XOOPS_ROOT_PATH."/kernel/module.php"); +include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php"; +include_once XOOPS_ROOT_PATH."/class/tree.php"; +include_once XOOPS_ROOT_PATH."/class/xoopslists.php"; +include_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php"; +include_once XOOPS_ROOT_PATH."/modules/extcal/include/constantes.php"; +include_once XOOPS_ROOT_PATH.'/class/pagenav.php'; +include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php'; +include_once(XOOPS_ROOT_PATH."/class/uploader.php"); +include 'admin_header.php'; + +//include_once("functions.php"); +//include_once("../include/functions.php"); + +if ( $xoopsUser ) { + $xoopsModule = XoopsModule::getByDirname("extcal"); + if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) { + redirect_header(XOOPS_URL."/",3,_NOPERM); + exit(); + } +} else { + redirect_header(XOOPS_URL."/",3,_NOPERM); + exit(); +} + +// Include language file +xoops_loadLanguage('admin', 'system'); +xoops_loadLanguage('admin', $xoopsModule->getVar('dirname', 'e')); +xoops_loadLanguage('modinfo', $xoopsModule->getVar('dirname', 'e')); +$myts =& MyTextSanitizer::getInstance(); + +//appel des class +$etablissementHandler = xoops_getmodulehandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE); + +xoops_cp_header(); + +if (isset($_REQUEST['op'])) { + $op = $_REQUEST['op']; +} else { + $op = 'liste'; +} + +//appel du menu admin +// if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) { + // adminmenu(4, _MI_EXTCAL_ETABLISSEMENT); +// } else { + // include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php'; + // loadModuleAdminMenu (4, _MI_EXTCAL_ETABLISSEMENT); +// } + +//Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page +switch ($op) +{ + // Vue liste + case "liste": + + // @author JJDAI + //*************************************************************************************** + $etablissementAdmin = new ModuleAdmin(); + echo $etablissementAdmin->addNavigation('etablissement.php'); + //*************************************************************************************** + + $criteria = new CriteriaCompo(); + if (isset($_REQUEST['limit'])) { + $criteria->setLimit($_REQUEST['limit']); + $limit = $_REQUEST['limit']; + } else { + $criteria->setLimit(10); + $limit = 10; + } + if (isset($_REQUEST['start'])) { + $criteria->setStart($_REQUEST['start']); + $start = $_REQUEST['start']; + } else { + $criteria->setStart(0); + $start = 0; + } + $criteria->setSort('nom'); + $criteria->setOrder('ASC'); + $etablissement_arr = $etablissementHandler->getObjects($criteria); + $numrows = $etablissementHandler->getCount($criteria); + if ( $numrows > $limit ) { + $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit); + $pagenav = $pagenav->renderNav(4); + } else { + $pagenav = ''; + } + //Affichage du tableau des téléchargements brisés + if ($numrows > 0) { + echo '<table width="100%" cellspacing="1" class="outer">'; + echo '<tr>'; + echo '<th align="center">' . _AM_EXTCAL_ETABLISSEMENT_FORM_NOM . '</th>'; + echo '<th align="center" width="20%">' . _AM_EXTCAL_ETABLISSEMENT_FORM_ADRESSE . '</th>'; + echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_TELEPHONE.'</th>'; + echo '<th align="center" width="15%">'._AM_EXTCAL_ETABLISSEMENT_FORM_ACTION.'</th>'; + echo '</tr>'; + $class = 'odd'; + foreach (array_keys($etablissement_arr) as $i) + { + $class = ($class == 'even') ? 'odd' : 'even'; + $etablissement_id = $etablissement_arr[$i]->getVar('id'); + $etablissement_nom = $etablissement_arr[$i]->getVar('nom'); + $etablissement_adresse = $etablissement_arr[$i]->getVar('adresse'); + $etablissement_telephone = $etablissement_arr[$i]->getVar('telephone'); + echo '<tr class="'.$class.'">'; + echo '<td align="left">' + . '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '">' + . $etablissement_nom + . '</a>' + . '</td>'; + + echo '<td align="center"><b>' . $etablissement_adresse . '</td>'; + echo '<td align="center"><b>' . $etablissement_telephone . '</td>'; + echo '<td align="center" width="15%">'; + echo '<a href="etablissement.php?op=edit_etablissement&etablissement_id=' . $etablissement_id . '"><img src='. $pathImageIcon .'/edit.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_EDIT . '"></a> '; + echo '<a href="etablissement.php?op=delete_etablissement&etablissement_id=' . $etablissement_id . '"><img src='. $pathImageIcon .'/delete.png alt="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '" title="' . _AM_EXTCAL_ETABLISSEMENT_FORM_DELETE . '"></a> '; + echo '</td>'; + } + echo '</table><br />'; + echo '<br /><div align=right>' . $pagenav . '</div><br />'; + }else{ + echo '<div class="errorMsg" style="text-align: center;">' . _AM_EXTCAL_ERREUR_NO_ETABLISSEMENT . '</div>'; + } + + // Affichage du formulaire + $obj =& $etablissementHandler->create(); + $form = $obj->getForm(false); + break; + + // permet de suprimmer le rapport de téléchargment brisé + case "delete_etablissement": + $obj =& $etablissementHandler->get($_REQUEST['etablissement_id']); + if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) { + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('etablissement.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if ($etablissementHandler->delete($obj)) { + redirect_header('etablissement.php', 1, _AM_EXTCAL_REDIRECT_DELOK); + } + } else { + xoops_confirm(array('ok' => 1, 'etablissement_id' => $_REQUEST['etablissement_id'], 'op' => 'delete_etablissement'), $_SERVER['REQUEST_URI'], _AM_EXTCAL_ETABLISSEMENT_SURDEL . '<br>'); + } + break; + + + case "edit_etablissement": + // @author JJDAI + //*************************************************************************************** + $etablissementAdmin = new ModuleAdmin(); + echo $etablissementAdmin->addNavigation('etablissement.php'); + //*************************************************************************************** + //Affichage du formulaire de création des téléchargements + $obj = $etablissementHandler->get($_REQUEST['etablissement_id']); + $form = $obj->getForm (false); + break; + + case "save_etablissement": + if ( !$GLOBALS["xoopsSecurity"]->check() ) { + redirect_header("etablissement.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors())); + } + if (isset($_REQUEST["etablissement_id"])) { + $obj =& $etablissementHandler->get($_REQUEST["etablissement_id"]); + } else { + $obj =& $etablissementHandler->create(); + } + + $obj->setVar("nom", $_REQUEST["nom"]); + $obj->setVar("description", $_REQUEST["description"]); + $obj->setVar("categorie", $_REQUEST["categorie"]); + $obj->setVar("adresse", $_REQUEST["adresse"]); + $obj->setVar("adresse2", $_REQUEST["adresse2"]); + $obj->setVar("cp", $_REQUEST["cp"]); + $obj->setVar("ville", $_REQUEST["ville"]); + $obj->setVar("tel_fixe", $_REQUEST["tel_fixe"]); + $obj->setVar("tel_portable", $_REQUEST["tel_portable"]); + $obj->setVar("mail", $_REQUEST["mail"]); + $obj->setVar("site", $_REQUEST["site"]); + $obj->setVar("horaires", $_REQUEST["horaires"]); + $obj->setVar("divers", $_REQUEST["divers"]); + $obj->setVar("tarifs", $_REQUEST["tarifs"]); + $obj->setVar("map", $_REQUEST["map"]); + + //Logo + $uploaddir_etablissement = XOOPS_ROOT_PATH . '/uploads/extcal/etablissement/'; + $uploadurl_etablissement = XOOPS_URL . '/uploads/extcal/etablissement/'; + + $delimg = @$_REQUEST['delimg']; + $delimg = isset($delimg) ? intval($delimg) : 0; + if (!empty($_REQUEST['xoops_upload_file'][0]) && $delimg == 0) + { + $upload = new XoopsMediaUploader($uploaddir_etablissement, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), 3145728, null, null); + if ($upload->fetchMedia($_REQUEST['xoops_upload_file'][0])) + { + $upload->setPrefix('etablissement_') ; + $upload->fetchMedia($_REQUEST['xoops_upload_file'][0]); + if (!$upload->upload()) { + $errors = $upload->getErrors(); + redirect_header("javascript:history.go(-1)",3, $errors); + } else { + $logo = $upload->getSavedFileName(); + } + } else if (!empty($_REQUEST['file'])) { + $logo = $_REQUEST['file']; + } + } else { + $logo = ''; + $url_etablissement = XOOPS_ROOT_PATH . "/uploads/extcal/etablissement/". $_REQUEST['file']; + if (is_file($url_etablissement)){ + chmod($url_etablissement, 0777); + unlink($url_etablissement); + } + } + $obj->setVar("logo", $logo); + + + if ($etablissementHandler->insert($obj)) { + } + + //include_once("../include/forms.php"); + echo $obj->getHtmlErrors(); + $form =& $obj->getForm(false, 0); +//echo "<hr>exit <<<<<<<<<<<<<<<<<<<<";exi... [truncated message content] |