From: <be...@us...> - 2014-11-12 12:14:48
|
Revision: 12837 http://sourceforge.net/p/xoops/svn/12837 Author: beckmi Date: 2014-11-12 12:14:20 +0000 (Wed, 12 Nov 2014) Log Message: ----------- updates for XOOPS 2.5.7 (work in progress) Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/about.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_footer.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_header.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/cat.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/etablissement.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/menu.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/upgrade.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/day_events.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/minical.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/new_events.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/random_events.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/spotlight_events.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/upcoming.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/ExtcalPersistableObjectHandler.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/cat.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/colorTools.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/config.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/etablissement.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/eventmember.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/eventnotmember.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/extDateTime.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/form/extcalform.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/form/formdatetime.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/form/formfilecheckbox.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/form/formrecurrules.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/form/formrrulecheckbox.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pclerror.lib.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pcltar.lib.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pcltrace.lib.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Calendar.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Day.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Decorator/Textual.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Decorator/Uri.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Decorator/Weekday.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Decorator/Wrapper.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Decorator.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Engine/Interface.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Engine/PearDate.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Engine/UnixTS.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Factory.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Hour.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Minute.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Month/Weekdays.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Month/Weeks.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Month.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Second.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Table/Helper.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Util/Textual.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Util/Uri.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Validator.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Year.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/1.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/1.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/10.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/11.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/12.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/12.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/13.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/13.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/14.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/14.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/15.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/16.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/17.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/18.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/19.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/2.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/2.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/20.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/21.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/21.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/22.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/23.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/23.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/3.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/4.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/5.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/6.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/7.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/8.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/8.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/docs/examples/9.phps XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/all_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/calendar_engine_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/calendar_include.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tabular_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/calendar_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/calendar_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/day_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/decorator_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/decorator_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/decorator_textual_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/decorator_uri_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/helper_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/hour_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/minute_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/month_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/month_weekdays_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/month_weeks_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/peardate_engine_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/second_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/simple_include.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/table_helper_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/unixts_engine_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/util_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/util_textual_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/util_uri_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/validator_error_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/validator_tests.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/validator_unit_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/week_firstday_0_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/week_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/tests/year_test.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/perm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/tableForm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/time.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/comment_delete.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/comment_edit.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/comment_new.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/comment_post.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/comment_reply.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/changelog.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/credits.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/lang_diff.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/download_attachement.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/edit_event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/etablissement.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/event_member.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/event_notmember.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/header.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/admin.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/agenda_fnc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/constantes.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/install_function.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/mail_fnc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/notification.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/search.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/style.css XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/update_function.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/english/admin.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/english/blocks.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/english/main.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/english/modinfo.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/new_event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/notification_update.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/post.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/print.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/rss.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/sql/mysql.sql XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_04.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_15.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_21.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_28.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_33.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_34.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_35.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/versions/extcal_2_37.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_agenda-day.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_agenda-week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_calendar-month.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_calendar-week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_day.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_month.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_new-event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_search.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_year.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/xoops_version.php Added Paths: ----------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/permissions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Award.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Bow tie.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Cinema.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Coffee.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Critical.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Dating.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Dollar.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Game_strategy.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Hamburger.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Help.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Hint.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Home.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Info.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Kids.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Music.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/View.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/Warning.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/images/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/css/infobulle.css XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/arrows/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/arrows/next.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/arrows/previous.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/bubble.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/extcal_logo.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge01.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge02.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge03.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge04.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge05.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge06.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge08.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge09.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge10.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge11.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge12.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge14.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge15.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge16.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge17.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge18.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge19.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge20.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge21.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge23.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge24.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge27.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge31.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/horloge33.swf XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/horloges/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/32/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/32/etablissement.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/32/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/addevent.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/event-end.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/event-middle.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/event-single.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/event-start.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/extcal.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/minus.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/plus.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/icons/rss.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/left_both.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/modadminbg.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/no_picture.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/right_both.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/images/trame.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/extcal_highslide.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/close.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/closeX.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar-black-border.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar-text-buttons.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar-white-small.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar-white.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar2.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar3.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar4-hover.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/controlbar4.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/fullexpand.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/geckodimmer.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/icon.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/loader.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/loader.white.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/Outlines.psd XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/beveled.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/drop-shadow.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/glossy-dark.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/outer-glow.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/rounded-black.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/outlines/rounded-white.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/resize.gif XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/scrollarrows.png XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/zoomin.cur XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/graphics/zoomout.cur XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-full.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-full.min.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-full.packed.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-ie6.css XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-with-gallery.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-with-gallery.min.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-with-gallery.packed.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-with-html.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-with-html.min.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide-with-html.packed.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide.css XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide.min.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/assets/js/highslide.packed.js XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/category_events.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/mmm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/upgrade.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/english/mail_template/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/admin/extcal_admin_cat_list.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_day.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_minical.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_new.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_random.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_spotlight.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_upcoming.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_upcomingByCategory.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/test.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_buttons_event.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_categorie.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_etablissement.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_event.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_event_list1.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_event_nav_btn.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_horloge.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_imgXoops.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_info_bulle.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_mail_invitation.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_mail_member_text.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_mail_member_tpl.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_multiUploads.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_navbar.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_post.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_rss.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_agenda-day.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_agenda-week.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_calendar-month.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_calendar-week.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_day.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_month.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_new-event.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_search.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_week.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_year.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/AddCategory XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/AddEventByAdmin XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/AddEventFrontEnd XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/DeleteEventAdmin XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/DeleteEventFrontEnd XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/EditEvent XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/ViewEvent XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/_extCalTestSuite XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/index.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/selenium/readme.txt Removed Paths: ------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/perm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/blocks/catetogy_events.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/css/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/images/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/js/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/french/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/french_iso/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/language/spanish/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/admin/extcal_admin_cat_list.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_day.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_minical.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_new.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_random.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_spotlight.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_upcoming.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/blocks/extcal_block_upcomingByCategory.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_buttons_event.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_categorie.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_etablissement.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_event.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_event_list1.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_event_nav_btn.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_horloge.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_imgXoops.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_info_bulle.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_mail_invitation.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_mail_member_html.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_mail_member_text.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_multiUploads.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_navbar.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_post.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_rss.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_agenda-day.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_agenda-week.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_calendar-month.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_calendar-week.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_day.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_month.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_new-event.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_search.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_week.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/templates/extcal_view_year.html XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/AddCategory XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/AddEventByAdmin XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/AddEventFrontEnd XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/DeleteEventAdmin XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/DeleteEventFrontEnd XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/EditEvent XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/ViewEvent XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/_extCalTestSuite XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/test/readme.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/upgrade.txt Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/about.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/about.php 2014-11-11 15:16:11 UTC (rev 12836) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/about.php 2014-11-12 12:14:20 UTC (rev 12837) @@ -11,15 +11,15 @@ * * @copyright The XOOPS Project (http://www.xoops.org) * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/) - * @package extCal + * @package extCal * @since 2.5.0 - * @author Mage, Mamba - * @version $Id $ + * @author Mage, Mamba + * @version $Id $ **/ -include '../../../include/cp_header.php'; -include '../../../class/xoopsformloader.php'; -include 'admin_header.php'; +include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; +include dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); @@ -27,7 +27,4 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -include 'admin_footer.php'; - - -?> +include_once __DIR__ . '/admin_footer.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_footer.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_footer.php 2014-11-11 15:16:11 UTC (rev 12836) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_footer.php 2014-11-12 12:14:20 UTC (rev 12837) @@ -1,29 +1,28 @@ -<?php -/** - * extCal module - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license - * @package:: extCal - * @subpackage:: admin - * @since: 2.5.0 - * @author Mamba (www.xoops.org) - * @version:: $Id $ - **/ - - -echo "<div class='adminfooter'>\n" - ." <div style='text-align: center;'>\n" - ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" - ." </div>\n" - ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" - ."</div>"; - -xoops_cp_footer(); +<?php +/** + * extCal module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license + * @package:: extCal + * @subpackage:: admin + * @since: 2.5.0 + * @author Mamba (www.xoops.org) + * @version:: $Id $ + **/ + +echo "<div class='adminfooter'>\n" + ." <div style='text-align: center;'>\n" + ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." </div>\n" + ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" + ."</div>"; + +xoops_cp_footer(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_header.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_header.php 2014-11-11 15:16:11 UTC (rev 12836) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/admin_header.php 2014-11-12 12:14:20 UTC (rev 12837) @@ -1,51 +1,50 @@ -<?php -// $Id: admin_header.php 1511 2011-09-01 20:56:07Z jjdai $ -// ------------------------------------------------------------------------ // -// XOOPS - PHP Content Management System // -// Copyright (c) 2000 XOOPS.org // -// <http://www.xoops.org/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// 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'; - -global $xoopsModule; - -$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); - -// Load language files -xoops_loadLanguage('admin', $thisModuleDir); -xoops_loadLanguage('modinfo', $thisModuleDir); -xoops_loadLanguage('main', $thisModuleDir); - -$pathIcon16 = '../' . $xoopsModule->getInfo('icons16'); -$pathIcon32 = '../' . $xoopsModule->getInfo('icons32'); -$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); - -if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) { - include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'); -} else { - redirect_header("../../../admin.php", 5, _AM_EXTCAL_MODULEADMIN_MISSING, false); -} \ No newline at end of file +<?php +// $Id: admin_header.php 1511 2011-09-01 20:56:07Z jjdai $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + +$path = dirname(dirname(dirname(__DIR__))); +include_once $path . '/mainfile.php'; +include_once $path . '/include/cp_functions.php'; +require_once $path . '/include/cp_header.php'; + +global $xoopsModule; + +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); + +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); + +$pathIcon16 = '../' . $xoopsModule->getInfo('icons16'); +$pathIcon32 = '../' . $xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + +if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) { + include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'); +} else { + redirect_header("../../../admin.php", 5, _AM_EXTCAL_MODULEADMIN_MISSING, false); +} Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/cat.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/cat.php 2014-11-11 15:16:11 UTC (rev 12836) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/cat.php 2014-11-12 12:14:20 UTC (rev 12837) @@ -1,263 +1,259 @@ -<?php - -include '../../../include/cp_header.php'; -include '../../../class/xoopsformloader.php'; -include 'admin_header.php'; -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($cat_id)) { - $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); - $varArr = array( - 'cat_name' => $cat_name, - 'cat_desc' => $cat_desc, - 'cat_weight'=> $cat_weight, - 'cat_color' => substr($cat_color, 1), - 'cat_icone' => $cat_icone - ); - - - $catHandler->modifyCat($cat_id, $varArr); - redirect_header("cat.php", 3, _AM_EXTCAL_CAT_EDITED, false); - // Create new cat - } else { - $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); - $varArr = array( - 'cat_name' => $cat_name, - 'cat_desc' => $cat_desc, - 'cat_weight'=> $cat_weight, - 'cat_color' => substr($cat_color, 1), - 'cat_icone' => $cat_icone - ); - $catHandler->createCat($varArr); - redirect_header("cat.php", 3, _AM_EXTCAL_CAT_CREATED, false); - } - - break; - - case 'new': - - xoops_cp_header(); - - $catHandler = xoops_getmodulehandler(_EXTCAL_CLS_CAT, _EXTCAL_MODULE); - //$cat = $catHandler->getCat($cat_id, true); - - $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")); - - $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images'; - $tf = XoopsLists::getImgListAsArray($file_path); - array_unshift($tf, _MD_EXTCAL_NONE); - //$xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), ''); - $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", '', ''); - $xfIcones->addOptionArray($tf); - $form->addElement($xfIcones, false); - - $form->addElement(new XoopsFormButton("", "form_submit", _SEND, "submit"), false); - - $form->display(); - - include 'admin_footer.php'; - break; - - case 'edit': - xoops_cp_header(); - - $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')) - ); - - $file_path = XOOPS_ROOT_PATH . '/modules/extcal/css/images'; - $tf = XoopsLists::getImgListAsArray($file_path); - array_unshift($tf, _MD_EXTCAL_NONE); - $xfIcones = new XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), ''); - $xfIcones->addOptionArray($tf); - $form->addElement($xfIcones, false); - - $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(); - 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($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 '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; -//... [truncated message content] |
From: <be...@us...> - 2015-01-16 11:44:55
|
Revision: 12936 http://sourceforge.net/p/xoops/svn/12936 Author: beckmi Date: 2015-01-16 10:54:08 +0000 (Fri, 16 Jan 2015) Log Message: ----------- xBootstrap compatibility Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/menu.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/cat.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/config.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/etablissement.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/eventmember.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/eventnotmember.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Engine/PearDate.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/pear/Calendar/Week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/perm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/time.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/changelog.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/constantes.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/notification.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/include/search.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_agenda-day.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_agenda-week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_calendar-month.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_calendar-week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_day.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_month.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_new-event.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_search.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_week.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/view_year.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/xoops_version.php Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/menu.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/menu.php 2015-01-12 12:30:54 UTC (rev 12935) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/admin/menu.php 2015-01-16 10:54:08 UTC (rev 12936) @@ -1,53 +1,53 @@ -<?php - -// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); - -$path = dirname(dirname(dirname(__DIR__))); -include_once $path . '/mainfile.php'; - -$dirname = basename(dirname(__DIR__)); -$module_handler = xoops_gethandler('module'); -$module = $module_handler->getByDirname($dirname); -$pathIcon32 = $module->getInfo('icons32'); -$pathModuleAdmin = $module->getInfo('dirmoduleadmin'); -$pathLanguage = $path . $pathModuleAdmin; - -if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) { - $fileinc = $pathLanguage . '/language/english/main.php'; -} - -include_once $fileinc; - -$adminmenu = array(); - -$i = 1; -$adminmenu[$i]['title'] = _MI_EXTCAL_INDEX; -$adminmenu[$i]['link'] = "admin/index.php"; -$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png'; -++$i; -$adminmenu[$i]['title'] = _MI_EXTCAL_CATEGORY; -$adminmenu[$i]['link'] = "admin/cat.php"; -$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png'; -++$i; -$adminmenu[$i]['title'] = _MI_EXTCAL_EVENT; -$adminmenu[$i]['link'] = "admin/event.php"; -$adminmenu[$i]["icon"] = $pathIcon32 . '/event.png'; -++$i; -$adminmenu[$i]['title'] = _MI_EXTCAL_ETABLISSEMENTS; -$adminmenu[$i]['link'] = "admin/etablissement.php"; -//$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/etablissement.png'; -$adminmenu[$i]["icon"] = 'assets/images/icons/32/etablissement.png'; -//echo $adminmenu[$i]["icon"]."<br>"; - -++$i; -$adminmenu[$i]['title'] = _MI_EXTCAL_PERMISSIONS; -$adminmenu[$i]['link'] = "admin/permissions.php"; -$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png'; -//++$i; -//$adminmenu[$i]['title'] = _MI_EXTCAL_PRUNING; -//$adminmenu[$i]['link'] = "admin/prune.php"; -//$adminmenu[$i]["icon"] = "assets/images/admin/about.png"; -++$i; -$adminmenu[$i]["title"] = _MI_EXTCAL_ABOUT; -$adminmenu[$i]["link"] = "admin/about.php"; -$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png'; +<?php + +// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined"); + +$path = dirname(dirname(dirname(__DIR__))); +include_once $path . '/mainfile.php'; + +$dirname = basename(dirname(__DIR__)); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); +$pathModuleAdmin = $module->getInfo('dirmoduleadmin'); +$pathLanguage = $path . $pathModuleAdmin; + +if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) { + $fileinc = $pathLanguage . '/language/english/main.php'; +} + +include_once $fileinc; + +$adminmenu = array(); + +$i = 1; +$adminmenu[$i]['title'] = _MI_EXTCAL_INDEX; +$adminmenu[$i]['link'] = "admin/index.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png'; +++$i; +$adminmenu[$i]['title'] = _MI_EXTCAL_CATEGORY; +$adminmenu[$i]['link'] = "admin/cat.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png'; +++$i; +$adminmenu[$i]['title'] = _MI_EXTCAL_EVENT; +$adminmenu[$i]['link'] = "admin/event.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/event.png'; +++$i; +$adminmenu[$i]['title'] = _MI_EXTCAL_ETABLISSEMENTS; +$adminmenu[$i]['link'] = "admin/etablissement.php"; +//$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/etablissement.png'; +$adminmenu[$i]["icon"] = 'assets/images/icons/32/etablissement.png'; +//echo $adminmenu[$i]["icon"]."<br>"; + +++$i; +$adminmenu[$i]['title'] = _MI_EXTCAL_PERMISSIONS; +$adminmenu[$i]['link'] = "admin/permissions.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png'; +//++$i; +//$adminmenu[$i]['title'] = _MI_EXTCAL_PRUNING; +//$adminmenu[$i]['link'] = "admin/prune.php"; +//$adminmenu[$i]["icon"] = "assets/images/admin/about.png"; +++$i; +$adminmenu[$i]["title"] = _MI_EXTCAL_ABOUT; +$adminmenu[$i]["link"] = "admin/about.php"; +$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/cat.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/cat.php 2015-01-12 12:30:54 UTC (rev 12935) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/cat.php 2015-01-16 10:54:08 UTC (rev 12936) @@ -1,216 +1,216 @@ -<?php - -// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); - -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/ExtcalPersistableObjectHandler.php'; -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php'; -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/time.php'; - -/** - * Class ExtcalCat - */ -class ExtcalCat extends XoopsObject -{ - - var $externalKey = array(); - - function ExtcalCat() - { - $this->initVar('cat_id', XOBJ_DTYPE_INT, null, false); - $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX, null, true, 255); - $this->initVar('cat_desc', XOBJ_DTYPE_TXTAREA, null, false); - $this->initVar('cat_color', XOBJ_DTYPE_TXTBOX, '000000', false, 255); - $this->initVar('cat_weight', XOBJ_DTYPE_INT, 0, false); - $this->initVar('cat_icone', XOBJ_DTYPE_TXTBOX, '', false, 50); - } - -} - -/** - * Class ExtcalCatHandler - */ -class ExtcalCatHandler extends ExtcalPersistableObjectHandler -{ - - var $_extcalPerm; - - /** - * @param $db - */ - function __construct(&$db) - { - $this->_extcalPerm = ExtcalPerm::getHandler(); - parent::__construct($db, 'extcal_cat', _EXTCAL_CLN_CAT, 'cat_id'); - } - - /** - * @param $data - * - * @return bool - */ - function createCat($data) - { - $cat = $this->create(); - $cat->setVars($data); - $this->insert($cat); - - $catId = $this->getInsertId(); - - // Retriving permission mask - $groupPermissionHandler =& xoops_gethandler('groupperm'); - $moduleId = $GLOBALS['xoopsModule']->getVar('mid'); - - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('gperm_name', 'extcal_perm_mask')); - $criteria->add(new Criteria('gperm_modid', $moduleId)); - $permMask = $groupPermissionHandler->getObjects($criteria); - - // Retriving group list - $memberHandler =& xoops_gethandler('member'); - $glist = $memberHandler->getGroupList(); - - // Applying permission mask - foreach ( - $permMask as $perm - ) { - if ($perm->getVar('gperm_itemid') == 1 - ) { - $groupPermissionHandler->addRight('extcal_cat_view', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); - } - if ($perm->getVar('gperm_itemid') == 2 - ) { - $groupPermissionHandler->addRight('extcal_cat_submit', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); - } - if ($perm->getVar('gperm_itemid') == 4 - ) { - $groupPermissionHandler->addRight('extcal_cat_autoapprove', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); - } - if ($perm->getVar('gperm_itemid') == 8 - ) { - $groupPermissionHandler->addRight('extcal_cat_edit', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); - } - } - - return true; - } - - /** - * @param $catId - * @param $data - * - * @return bool - */ - function modifyCat($catId, $data) - { - $cat = $this->get($catId); - $cat->setVars($data); - - return $this->insert($cat); - } - - /** - * @param $catId - */ - function deleteCat($catId) - { - /* TODO : - - Delete all event in this category - */ - $this->delete($catId); - } - - // Return one cat selected by his id - /** - * @param $catId - * @param bool $skipPerm - * - * @return bool - */ - function getCat($catId, $skipPerm = false) - { - $criteriaCompo = new CriteriaCompo(); - $criteriaCompo->add(new Criteria('cat_id', $catId)); - if (!$skipPerm) { - $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']); - } - $ret = $this->getObjects($criteriaCompo); - if (isset($ret[0])) { - return $ret[0]; - } else { - return false; - } - } - - /** - * @param $user - * @param string $perm - * - * @return array - */ - function getAllCat($user, $perm = 'extcal_cat_view') - { - $criteriaCompo = new CriteriaCompo(); - if ($perm != 'all') { - $this->_addCatPermCriteria($criteriaCompo, $user, $perm); - } - - return $this->getObjects($criteriaCompo); - } - - /** - * @param $user - * @param string $perm - * - * @return array - */ - function getAllCatById($user, $perm = 'all') - { - $criteriaCompo = new CriteriaCompo(); - if ($perm != 'all') { - $this->_addCatPermCriteria($criteriaCompo, $user, $perm); - } - - $t = $this->objectToArray($this->getObjects($criteriaCompo)); - $r = array(); - while (list($k, $v) = each($t)) { - $r[$v['cat_id']] = $v; - } - - return $r; - } - - /** - * @param $criteria - * @param $user - * @param string $perm - */ - function _addCatPermCriteria(&$criteria, &$user, $perm = 'extcal_cat_view') - { - $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); - $count = count($authorizedAccessCats); - if ($count > 0) { - $in = '(' . $authorizedAccessCats[0]; - array_shift($authorizedAccessCats); - foreach ( - $authorizedAccessCats as $authorizedAccessCat - ) { - $in .= ',' . $authorizedAccessCat; - } - $in .= ')'; - $criteria->add(new Criteria('cat_id', $in, 'IN')); - } else { - $criteria->add(new Criteria('cat_id', '(0)', 'IN')); - } - } - - /** - * @param $xoopsUser - * - * @return bool - */ - function haveSubmitRight(&$xoopsUser) - { - return count($this->_extcalPerm->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0; - } - -} +<?php + +// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined"); + +include_once XOOPS_ROOT_PATH . '/modules/extcal/class/ExtcalPersistableObjectHandler.php'; +include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php'; +include_once XOOPS_ROOT_PATH . '/modules/extcal/class/time.php'; + +/** + * Class ExtcalCat + */ +class ExtcalCat extends XoopsObject +{ + + var $externalKey = array(); + + function ExtcalCat() + { + $this->initVar('cat_id', XOBJ_DTYPE_INT, null, false); + $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX, null, true, 255); + $this->initVar('cat_desc', XOBJ_DTYPE_TXTAREA, null, false); + $this->initVar('cat_color', XOBJ_DTYPE_TXTBOX, '000000', false, 255); + $this->initVar('cat_weight', XOBJ_DTYPE_INT, 0, false); + $this->initVar('cat_icone', XOBJ_DTYPE_TXTBOX, '', false, 50); + } + +} + +/** + * Class ExtcalCatHandler + */ +class ExtcalCatHandler extends ExtcalPersistableObjectHandler +{ + + var $_extcalPerm; + + /** + * @param $db + */ + function __construct(&$db) + { + $this->_extcalPerm = ExtcalPerm::getHandler(); + parent::__construct($db, 'extcal_cat', _EXTCAL_CLN_CAT, 'cat_id'); + } + + /** + * @param $data + * + * @return bool + */ + function createCat($data) + { + $cat = $this->create(); + $cat->setVars($data); + $this->insert($cat); + + $catId = $this->getInsertId(); + + // Retriving permission mask + $groupPermissionHandler =& xoops_gethandler('groupperm'); + $moduleId = $GLOBALS['xoopsModule']->getVar('mid'); + + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('gperm_name', 'extcal_perm_mask')); + $criteria->add(new Criteria('gperm_modid', $moduleId)); + $permMask = $groupPermissionHandler->getObjects($criteria); + + // Retriving group list + $memberHandler =& xoops_gethandler('member'); + $glist = $memberHandler->getGroupList(); + + // Applying permission mask + foreach ( + $permMask as $perm + ) { + if ($perm->getVar('gperm_itemid') == 1 + ) { + $groupPermissionHandler->addRight('extcal_cat_view', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); + } + if ($perm->getVar('gperm_itemid') == 2 + ) { + $groupPermissionHandler->addRight('extcal_cat_submit', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); + } + if ($perm->getVar('gperm_itemid') == 4 + ) { + $groupPermissionHandler->addRight('extcal_cat_autoapprove', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); + } + if ($perm->getVar('gperm_itemid') == 8 + ) { + $groupPermissionHandler->addRight('extcal_cat_edit', $cat->getVar('cat_id'), $perm->getVar('gperm_groupid'), $moduleId); + } + } + + return true; + } + + /** + * @param $catId + * @param $data + * + * @return bool + */ + function modifyCat($catId, $data) + { + $cat = $this->get($catId); + $cat->setVars($data); + + return $this->insert($cat); + } + + /** + * @param $catId + */ + function deleteCat($catId) + { + /* TODO : + - Delete all event in this category + */ + $this->delete($catId); + } + + // Return one cat selected by his id + /** + * @param $catId + * @param bool $skipPerm + * + * @return bool + */ + function getCat($catId, $skipPerm = false) + { + $criteriaCompo = new CriteriaCompo(); + $criteriaCompo->add(new Criteria('cat_id', $catId)); + if (!$skipPerm) { + $this->_addCatPermCriteria($criteriaCompo, $GLOBALS['xoopsUser']); + } + $ret = $this->getObjects($criteriaCompo); + if (isset($ret[0])) { + return $ret[0]; + } else { + return false; + } + } + + /** + * @param $user + * @param string $perm + * + * @return array + */ + function getAllCat($user, $perm = 'extcal_cat_view') + { + $criteriaCompo = new CriteriaCompo(); + if ($perm != 'all') { + $this->_addCatPermCriteria($criteriaCompo, $user, $perm); + } + + return $this->getObjects($criteriaCompo); + } + + /** + * @param $user + * @param string $perm + * + * @return array + */ + function getAllCatById($user, $perm = 'all') + { + $criteriaCompo = new CriteriaCompo(); + if ($perm != 'all') { + $this->_addCatPermCriteria($criteriaCompo, $user, $perm); + } + + $t = $this->objectToArray($this->getObjects($criteriaCompo)); + $r = array(); + while (list($k, $v) = each($t)) { + $r[$v['cat_id']] = $v; + } + + return $r; + } + + /** + * @param $criteria + * @param $user + * @param string $perm + */ + function _addCatPermCriteria(&$criteria, &$user, $perm = 'extcal_cat_view') + { + $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); + $count = count($authorizedAccessCats); + if ($count > 0) { + $in = '(' . $authorizedAccessCats[0]; + array_shift($authorizedAccessCats); + foreach ( + $authorizedAccessCats as $authorizedAccessCat + ) { + $in .= ',' . $authorizedAccessCat; + } + $in .= ')'; + $criteria->add(new Criteria('cat_id', $in, 'IN')); + } else { + $criteria->add(new Criteria('cat_id', '(0)', 'IN')); + } + } + + /** + * @param $xoopsUser + * + * @return bool + */ + function haveSubmitRight(&$xoopsUser) + { + return count($this->_extcalPerm->getAuthorizedCat($xoopsUser, 'extcal_cat_submit')) > 0; + } + +} Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/config.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/config.php 2015-01-12 12:30:54 UTC (rev 12935) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/config.php 2015-01-16 10:54:08 UTC (rev 12936) @@ -1,43 +1,43 @@ -<?php - -// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); - -/** - * Class ExtcalConfig - */ -class ExtcalConfig -{ - - /** - * @return ExtcalConfig - */ - static function &getHandler() - { - static $configHandler; - if (!isset($configHandler[0])) { - $configHandler[0] = new ExtcalConfig(); - } - - return $configHandler[0]; - } - - function getModuleConfig() - { - global $xoopsModule; - static $moduleConfig; - $dirname = (isset($xoopsModule) ? $xoopsModule->getVar('dirname') : 'system'); - if ($dirname == 'extcal') { - $moduleConfig = $GLOBALS['xoopsModuleConfig']; - } else { - if (!isset($moduleConfig)) { - $moduleHandler =& xoops_gethandler('module'); - $module = $moduleHandler->getByDirname('extcal'); - $configHandler =& xoops_gethandler('config'); - $moduleConfig = $configHandler->getConfigList($module->getVar("mid")); - } - } - - return $moduleConfig; - } - -} +<?php + +// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined"); + +/** + * Class ExtcalConfig + */ +class ExtcalConfig +{ + + /** + * @return ExtcalConfig + */ + static function &getHandler() + { + static $configHandler; + if (!isset($configHandler[0])) { + $configHandler[0] = new ExtcalConfig(); + } + + return $configHandler[0]; + } + + function getModuleConfig() + { + global $xoopsModule; + static $moduleConfig; + $dirname = (isset($xoopsModule) ? $xoopsModule->getVar('dirname') : 'system'); + if ($dirname == 'extcal') { + $moduleConfig = $GLOBALS['xoopsModuleConfig']; + } else { + if (!isset($moduleConfig)) { + $moduleHandler =& xoops_gethandler('module'); + $module = $moduleHandler->getByDirname('extcal'); + $configHandler =& xoops_gethandler('config'); + $moduleConfig = $configHandler->getConfigList($module->getVar("mid")); + } + } + + return $moduleConfig; + } + +} Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/etablissement.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/etablissement.php 2015-01-12 12:30:54 UTC (rev 12935) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/etablissement.php 2015-01-16 10:54:08 UTC (rev 12936) @@ -1,171 +1,171 @@ -<?php -//Kraven 30 -// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); - -include_once XOOPS_ROOT_PATH . '/kernel/object.php'; - -//class ExtcalEvent extends XoopsObject -//class extcal_etablissement extends XoopsObject -/** - * Class ExtcalEtablissement - */ -class ExtcalEtablissement extends XoopsObject -{ - /** - * - */ - function __construct() - { - //Toutes les attributs de la table - $this->initVar("id", XOBJ_DTYPE_INT, null, false, 5); - $this->initVar("nom", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("description", XOBJ_DTYPE_TXTAREA, '', false); - $this->initVar("logo", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("categorie", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("adresse", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("adresse2", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("cp", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("ville", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("tel_fixe", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("tel_portable", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("mail", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("site", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("horaires", XOBJ_DTYPE_TXTAREA, '', false); - $this->initVar("divers", XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar("tarifs", XOBJ_DTYPE_TXTAREA, '', false); - $this->initVar("map", XOBJ_DTYPE_URL, false); - } - - function ExtcalEtablissement() - { - $this->__construct(); - } - - /** - * @param bool $action - * - * @return XoopsThemeForm - */ - function getForm($action = false) - { - global $xoopsDB, $extcalConfig; - - if ($action === false) { - $action = $_SERVER["REQUEST_URI"]; - } - - $title = $this->isNew() ? sprintf(_MD_EXTCAL_ETABLISSEMENT_ADD) : sprintf(_MD_EXTCAL_ETABLISSEMENT_EDIT); - - include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php"); - - $form = new XoopsThemeForm($title, "form", $action, "post", true); - $form->setExtra('enctype="multipart/form-data"'); - - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_NOM, "nom", 50, 255, $this->getVar("nom")), true); - $form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_ETABLISSEMENT_DESCRIPTION, 'description', $this->getVar("description"), 10), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CATEGORIE, "categorie", 40, 255, $this->getVar("categorie")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE, "adresse", 50, 255, $this->getVar("adresse")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE2, "adresse2", 50, 255, $this->getVar("adresse2")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CP, "cp", 10, 10, $this->getVar("cp")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_VILLE, "ville", 20, 255, $this->getVar("ville")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE, "tel_fixe", 20, 20, $this->getVar("tel_fixe")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE, "tel_portable", 20, 20, $this->getVar("tel_portable")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAIL, "mail", 50, 255, $this->getVar("mail")), false); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_SITE, "site", 50, 255, $this->getVar("site")), false); - $form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_HORAIRES, 'horaires', $this->getVar("horaires"), 3, 40)); - $form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_DIVERS, 'divers', $this->getVar("divers"), 5, 40)); - //$form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_TARIFS, 'tarifs', $this->getVar("tarifs"), 5, 40)); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS . ' ( ' . _MD_EXTCAL_DEVISE2 . ' )', "tarifs", 20, 20, $this->getVar("tarifs")), false); - - //$form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', $this->getVar("map"), 5, 40)); - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAP, "map", 150, 255, $this->getVar("map")), false); - - //Logo - $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), ''); - if ($this->getVar("logo") != '') { - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . "/uploads/extcal/etablissement/" . $this->getVar("logo") . "' name='image' id='image' alt=''/><br /><br />")); - $check_del_img = new XoopsFormCheckBox('', 'delimg'); - $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); - $file_tray->addElement($check_del_img); - $file_img = new XoopsFormFile(_MD_EXTCAL_IMG, 'attachedimage', 3145728); - unset($check_del_img); - } else { - $file_img = new XoopsFormFile('', 'attachedimage', 3145728); - } - $file_img->setExtra("size ='40'"); - $file_tray->addElement($file_img); - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, intval(3145728 / 1000), 500, 500); - $file_label = new XoopsFormLabel('', '<br />' . $msg); - $file_tray->addElement($file_label); - $form->addElement($file_tray); - $form->addElement(new XoopsFormHidden('file', $this->getVar("logo"))); - unset($file_img); - unset($file_tray); - - $form->addElement(new XoopsFormHidden("op", "save_etablissement")); - $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit")); - $form->display(); - - return $form; - } - -} - -/**************************************************************************/ - -/** - * Class ExtcalEtablissementHandler - */ -class ExtcalEtablissementHandler extends ExtcalPersistableObjectHandler -{ - /** - * @param $db - */ - function __construct(&$db) - { - parent::__construct($db, "extcal_etablissement", _EXTCAL_CLN_ETABLISSEMENT, "id", 'nom'); - } - - /** - * @param $etablissementId - * @param bool $skipPerm - * - * @return bool - */ - function getEtablissement($etablissementId, $skipPerm = false) - { - - $user = $GLOBALS['xoopsUser']; - - $criteriaCompo = new CriteriaCompo(); - $criteriaCompo->add(new Criteria('id', $etablissementId)); - - if (!$skipPerm) { - $this->_addCatPermCriteria($criteriaCompo, $user); - } - $ret = $this->getObjects($criteriaCompo); - if (isset($ret[0])) { - return $ret[0]; - } else { - return false; - } - } - - /** - * @param null $criteria - * @param bool $asObject - * - * @return array - */ - function getAll($criteria = null, $asObject = false) - { - - $rst = $this->getObjects($criteria, $asObject); - if ($asObject) { - return $rst; - } else { - return $this->objectToArray($rst); - } - } - -} +<?php +//Kraven 30 +// defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined"); + +include_once XOOPS_ROOT_PATH . '/kernel/object.php'; + +//class ExtcalEvent extends XoopsObject +//class extcal_etablissement extends XoopsObject +/** + * Class ExtcalEtablissement + */ +class ExtcalEtablissement extends XoopsObject +{ + /** + * + */ + function __construct() + { + //Toutes les attributs de la table + $this->initVar("id", XOBJ_DTYPE_INT, null, false, 5); + $this->initVar("nom", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("description", XOBJ_DTYPE_TXTAREA, '', false); + $this->initVar("logo", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("categorie", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("adresse", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("adresse2", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("cp", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("ville", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("tel_fixe", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("tel_portable", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("mail", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("site", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("horaires", XOBJ_DTYPE_TXTAREA, '', false); + $this->initVar("divers", XOBJ_DTYPE_TXTBOX, null, false); + $this->initVar("tarifs", XOBJ_DTYPE_TXTAREA, '', false); + $this->initVar("map", XOBJ_DTYPE_URL, false); + } + + function ExtcalEtablissement() + { + $this->__construct(); + } + + /** + * @param bool $action + * + * @return XoopsThemeForm + */ + function getForm($action = false) + { + global $xoopsDB, $extcalConfig; + + if ($action === false) { + $action = $_SERVER["REQUEST_URI"]; + } + + $title = $this->isNew() ? sprintf(_MD_EXTCAL_ETABLISSEMENT_ADD) : sprintf(_MD_EXTCAL_ETABLISSEMENT_EDIT); + + include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php"); + + $form = new XoopsThemeForm($title, "form", $action, "post", true); + $form->setExtra('enctype="multipart/form-data"'); + + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_NOM, "nom", 50, 255, $this->getVar("nom")), true); + $form->addElement(new XoopsFormDhtmlTextArea(_MD_EXTCAL_ETABLISSEMENT_DESCRIPTION, 'description', $this->getVar("description"), 10), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CATEGORIE, "categorie", 40, 255, $this->getVar("categorie")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE, "adresse", 50, 255, $this->getVar("adresse")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_ADRESSE2, "adresse2", 50, 255, $this->getVar("adresse2")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_CP, "cp", 10, 10, $this->getVar("cp")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_VILLE, "ville", 20, 255, $this->getVar("ville")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_FIXE, "tel_fixe", 20, 20, $this->getVar("tel_fixe")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TEL_PORTABLE, "tel_portable", 20, 20, $this->getVar("tel_portable")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAIL, "mail", 50, 255, $this->getVar("mail")), false); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_SITE, "site", 50, 255, $this->getVar("site")), false); + $form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_HORAIRES, 'horaires', $this->getVar("horaires"), 3, 40)); + $form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_DIVERS, 'divers', $this->getVar("divers"), 5, 40)); + //$form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_TARIFS, 'tarifs', $this->getVar("tarifs"), 5, 40)); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS . ' ( ' . _MD_EXTCAL_DEVISE2 . ' )', "tarifs", 20, 20, $this->getVar("tarifs")), false); + + //$form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', $this->getVar("map"), 5, 40)); + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAP, "map", 150, 255, $this->getVar("map")), false); + + //Logo + $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), ''); + if ($this->getVar("logo") != '') { + $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . "/uploads/extcal/etablissement/" . $this->getVar("logo") . "' name='image' id='image' alt=''/><br /><br />")); + $check_del_img = new XoopsFormCheckBox('', 'delimg'); + $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); + $file_tray->addElement($check_del_img); + $file_img = new XoopsFormFile(_MD_EXTCAL_IMG, 'attachedimage', 3145728); + unset($check_del_img); + } else { + $file_img = new XoopsFormFile('', 'attachedimage', 3145728); + } + $file_img->setExtra("size ='40'"); + $file_tray->addElement($file_img); + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, intval(3145728 / 1000), 500, 500); + $file_label = new XoopsFormLabel('', '<br />' . $msg); + $file_tray->addElement($file_label); + $form->addElement($file_tray); + $form->addElement(new XoopsFormHidden('file', $this->getVar("logo"))); + unset($file_img); + unset($file_tray); + + $form->addElement(new XoopsFormHidden("op", "save_etablissement")); + $form->addElement(new XoopsFormButton("", "submit", _SUBMIT, "submit")); + $form->display(); + + return $form; + } + +} + +/**************************************************************************/ + +/** + * Class ExtcalEtablissementHandler + */ +class ExtcalEtablissementHandler extends ExtcalPersistableObjectHandler +{ + /** + * @param $db + */ + function __construct(&$db) + { + parent::__construct($db, "extcal_etablissement", _EXTCAL_CLN_ETABLISSEMENT, "id", 'nom'); + } + + /** + * @param $etablissementId + * @param bool $skipPerm + * + * @return bool + */ + function getEtablissement($etablissementId, $skipPerm = false) + { + + $user = $GLOBALS['xoopsUser']; + + $criteriaCompo = new CriteriaCompo(); + $criteriaCompo->add(new Criteria('id', $etablissementId)); + + if (!$skipPerm) { + $this->_addCatPermCriteria($criteriaCompo, $user); + } + $ret = $this->getObjects($criteriaCompo); + if (isset($ret[0])) { + return $ret[0]; + } else { + return false; + } + } + + /** + * @param null $criteria + * @param bool $asObject + * + * @return array + */ + function getAll($criteria = null, $asObject = false) + { + + $rst = $this->getObjects($criteria, $asObject); + if ($asObject) { + return $rst; + } else { + return $this->objectToArray($rst); + } + } + +} Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/event.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/event.php 2015-01-12 12:30:54 UTC (rev 12935) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/class/event.php 2015-01-16 10:54:08 UTC (rev 12936) @@ -1,2862 +1,2862 @@ -<?php - -// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined"); - -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/ExtcalPersistableObjectHandler.php'; -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php'; -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/time.php'; -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/config.php'; -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/extDateTime.php'; - -include_once XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php'; - -/** - * Class ExtcalEvent - */ -class ExtcalEvent extends XoopsObject -{ - - var $externalKey = array(); - - /** - * - */ - function __construct() - { - $this->initVar('event_id', XOBJ_DTYPE_INT, null, false); - $this->initVar('cat_id', XOBJ_DTYPE_INT, null, true); - $this->initVar('event_title', XOBJ_DTYPE_TXTBOX, null, true, 255); - $this->initVar('event_desc', XOBJ_DTYPE_TXTAREA, '', false); - $this->initVar('event_organisateur', XOBJ_DTYPE_TXTBOX, '', false); - $this->initVar('event_contact', XOBJ_DTYPE_TXTBOX, '', false); - $this->initVar('event_url', XOBJ_DTYPE_URL, '', false); - $this->initVar('event_email', XOBJ_DTYPE_TXTBOX, '', false); - $this->initVar('event_address', XOBJ_DTYPE_TXTAREA, '', false); - $this->initVar('event_approved', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_start', XOBJ_DTYPE_INT, null, true); - $this->initVar('event_end', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_submitter', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_submitdate', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_nbmember', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_isrecur', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_recur_rules', XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar('event_recur_start', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_recur_end', XOBJ_DTYPE_INT, 0, false); - $this->initVar('dohtml', XOBJ_DTYPE_INT, 0, false); - $this->initVar('event_picture1', XOBJ_DTYPE_TXTBOX, null, false); - $this->initVar('event_picture2', XOBJ_DTYPE_TXTBOX, null, false); - //$this->initVar("event_price",XOBJ_DTYPE_OTHER,null,false,10); - $this->initVar('event_price', XOBJ_DTYPE_TXTBOX, '', false); - $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false); - $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false); - - $this->externalKey['cat_id'] = array( - 'className' => 'cat', - 'getMethodeName' => 'getCat', - 'keyName' => 'cat', - 'core' => false - ); - $this->externalKey['event_submitter'] = array( - 'className' => 'user', - 'getMethodeName' => 'get', - 'keyName' => 'user', - 'core' => true - ); - } - - /** - * @param $key - * - * @return mixed - */ - function getExternalKey($key) - { - return $this->externalKey[$key]; - } - -} - -/** - * Class ExtcalEventHandler - */ -class ExtcalEventHandler extends ExtcalPersistableObjectHandler -{ - - private $_extcalPerm; - private $_extcalTime; - private $_extcalConfig; - - /** - * @param $db - */ - function __construct(&$db) - { - $this->_extcalPerm = ExtcalPerm::getHandler(); - $this->_extcalTime = ExtcalTime::getHandler(); - // $extcalConfig = ExtcalConfig::getHandler(); - // $this->_extcalConfig = $extcalConfig->getModuleConfig(); - parent::__construct($db, 'extcal_event', _EXTCAL_CLN_EVENT, 'event_id'); - } - - /** - * @param $data - * - * @return bool - */ - function createEvent($data) - { - $event = $this->create(); - $this->_checkDate($data); - $this->_userTimeToServerTime($data); - $this->_addRecurValue($data); - $event->setVars($data); - - return $this->insert($event, true); - } - - /** - * @param $data - * - * @return object - */ - function createEventForPreview($data) - { - $event = $this->create(); - $this->_checkDate($data); - $this->_addRecurValue($data); - $event->setVars($data); - - return $event; - } - - /** - * @param $eventId - * @param $data - * - * @return bool - */ - function modifyEvent($eventId, $data) - { - $event = $this->get($eventId); - $this->_checkDate($data); - $this->_userTimeToServerTime($data); - $this->_addRecurValue($data); - $event->setVars($data); - - return $this->insert($event); - } - - /** - * @param $eventId - */ - function deleteEvent($eventId) - { - /* TODO : - - Delete who's going - - Delete who's not going - - Delete comment - - Delete notifications - */ - $this->delete($eventId, true); - } - - /** - * @param null $criteria - * @param bool $force - * @param bool $asObject - */ - function deleteAllEvents($criteria = null, $force = true, $asObject = false) - { - /* TODO : - - Delete who's going - - Delete who's not going - - Delete comment - - Delete notifications - */ - $this->deleteAll($criteria, $force, $asObject); - } - - /** - * @param null $criteria - * @param bool $asObject - * - * @return array - */ - function getAllEvents($criteria = null, $asObject = false) - { - - $rst = $this->getObjects($criteria, $asObject); - if ($asObject) { - return $rst; - } else { - return $this->objectToArray($rst); - } - } - - // Return one approved event selected by his id - /** - * @param $eventId - * @param bool $skipPerm - * - * @return bool - */ - function getEvent($eventId, $skipPerm = false) - { - - $user = $GLOBALS['xoopsUser']; - - $criteriaCompo = new CriteriaCompo(); - $criteriaCompo->add(new Criteria('event_id', $eventId)); - $criteriaCompo->add(new Criteria('event_approved', 1)); - if (!$skipPerm) { - $this->_addCatPermCriteria($criteriaCompo, $user); - } - $ret = $this->getObjects($criteriaCompo); - if (isset($ret[0])) { - return $ret[0]; - } else { - return false; - } - } - - // Return one event selected by his id (approve or not) - /** - * @param $eventId - * @param bool $skipPerm - * - * @return bool - */ - function getEventWithNotApprove($eventId, $skipPerm = false) - { - - $user = $GLOBALS['xoopsUser']; - - $criteriaCompo = new CriteriaCompo(); - $criteriaCompo->add(new Criteria('event_id', $eventId)); - if (!$skipPerm) { - $this->_addCatPermCriteria($criteriaCompo, $user); - } - $ret = $this->getObjects($criteriaCompo); - if (isset($ret[0])) { - return $ret[0]; - } else { - return false; - } - } - - /** - * @param $events - * @param $pattern - */ - function formatEventsDate(&$events, $pattern) - { - $max = count($events); - for ( - $i = 0; $i < $max; ++$i - ) { - $this->formatEventDate($events[$i], $pattern); - } - } - -// function getPicture1(&$event) { -// return $event['event_picture1']; -// } -// function getPicture2(&$event) { -// return $event['event_picture2']; -// } -// function getDesc(&$event) { -// return $event['event_desc']; -// } - - /** - * @param $event - * @param $pattern - */ - function formatEventDate(&$event, $pattern) - { - if (!$event['event_isrecur']) { - $event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']); - $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']); - } else { - $event['formated_event_start'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_start']); - $event['formated_event_end'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_end']); - $event['formated_reccur_rule'] = $this->_extcalTime->getFormatedReccurRule($event['event_recur_rules']); - } - $event['formated_event_submitdate'] = $this->_extcalTime->getFormatedDate($pattern, $event['event_submitdate']); - } - -//JJD - to valid modif -// function _checkDate(&$data) -// { -// -// list($year, $month, $day) = explode("-", $data['event_start']['date']); -// $data['event_start'] -// = -// mktime(0, 0, 0, $month, $day, $year) + $data['event_start']['time']; -// list($year, $month, $day) = explode("-", $data['event_end']['date']); -// $data['event_end'] -// = mktime(0, 0, 0, $month, $day, $year) + $data['event_end']['time']; -// -// if ($data['have_end'] == 0 || $data['event_start'] > $data['event_end'] -//) { -// $data['event_end'] = $data['event_start']; -// } -// -// } - - /** - * @param $data - */ - function _checkDate(&$data) - { - - $data['event_start'] = strtotime($data['event_start']['date']) + $data['event_start']['time']; - $data['event_end'] = strtotime($data['event_end']['date']) + $data['event_end']['time']; - - if ($data['have_end'] == 0 || $data['event_start'] > $data['event_end'] - ) { - $data['event_end'] = $data['event_start']; - } - - } - - /** - * @param $data - */ - function _userTimeToServerTime(&$data) - { - - $user = $GLOBALS['xoopsUser']; - - $data['event_start'] = userTimeToServerTime($data['event_start'], $this->_extcalTime->_getUserTimeZone($user)); - $data['event_end'] = userTimeToServerTime($data['event_end'], $this->_extcalTime->_getUserTimeZone($user)); - - } - - /** - * @param $data - */ - function serverTimeToUserTime(&$data) - { - - $user = $GLOBALS['xoopsUser']; - - $data['event_start'] = xoops_getUserTimestamp($data['event_start'], $this->_extcalTime->_getUserTimeZone($user)); - $data['event_end'] = xoops_getUserTimestamp($data['event_end'], $this->_extcalTime->_getUserTimeZone($user)); - $data['event_submitdate'] = xoops_getUserTimestamp($data['event_submitdate'], $this->_extcalTime->_getUserTimeZone($user)); - - } - - /** - * @param $events - */ - function serverTimeToUserTimes(&$events) - { - $max = count($events); - - for ( - $i = 0; $i < $max; ++$i - ) { - $this->serverTimeToUserTime($events[$i]); - } - } - - /** - * @param $data - */ - function _addRecurValue(&$data) - { - $data['event_isrecur'] = $this->getIsRecur($_POST); - $data['event_recur_rules'] = $this->getRecurRules($_POST); - $data['event_recur_start'] = $this->getRecurStart($data, $_POST); - $data['event_recur_end'] = $this->getRecurEnd($data, $_POST); - } - - /*************************************************************** - * Return events on perioe - ************************************************************** - * - * @param $criteres - * - * @return array - */ - function getEventsOnPeriode($criteres) - { - //ext_echoArray($criteres); - global $extcalConfig; - $myts =& MyTextSanitizer::getInstance(); // MyTextSanitizer object - - $eventsU = $this->getEventsUniques($criteres); - $eventsR = $this->getEventsRecurents($criteres); - $events = array_merge($eventsU, $eventsR); - - // $events = $eventsU; - - //ext_echoArray($events); - - //Tri des evennement par date ascendante - $ordre = array(); - $eventArray = array(); - - while (list($k, $v) = each($events)) { - $ordre[] = intval($v['event_start']); - $this->formatEventDate($v, $extcalConfig['event_date_week']); - //$v['cat']['cat_light_color'] = $v['cat']['cat_color']; - $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX); - if ($v['event_icone'] == '') { - $v['event_icone'] = $v['cat']['cat_icone']; - } - $v['event_desc'] = html_entity_decode($v['event_desc']); - $eventArray[] = $v; - } - array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC); - - return $eventArray; - } - - /***************************************************************** - * - **************************************************************** - * @param $criteres - * @return array -*/ - function getEventsUniques($criteres) - { - global $extcalConfig; - while (list($k, $v) = each($criteres)) { - $$k = $v; - - } - if (!isset($nbDays)) { - $nbDays = 7; - } - if (!isset($sens)) { - $sens = 'ASC'; - } - if (!isset($externalKeys)) { - $externalKeys = array('cat_id'); - } - //------------------------------------------------------ - switch ($periode) { - - case _EXTCAL_EVENTS_CALENDAR_WEEK: - $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays); - if (!$extcalConfig['diplay_past_event_cal']) { - $criteriaCompo->add(new Criteria('event_end', time(), '>')); - } - break; - - case _EXTCAL_EVENTS_WEEK: - case _EXTCAL_EVENTS_AGENDA_WEEK: - $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays); - if (!$extcalConfig['diplay_past_event_list']) { - $criteriaCompo->add(new Criteria('event_end', time(), '>')); - } - break; - - case _EXTCAL_EVENTS_CALENDAR_MONTH: - $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat); - - if (!$extcalConfig['diplay_past_event_cal']) { - $criteriaCompo->add(new Criteria('event_end', time(), '>')); - } - break; - - case _EXTCAL_EVENTS_MONTH: - $criteriaCompo = $this->_getEventMonthCriteria($month, $year, $cat); - - if (!$extcalConfig['diplay_past_event_list']) { - $criteriaCompo->add(new Criteria('event_end', time(), '>')); - } - break; - - case _EXTCAL_EVENTS_DAY: - $criteriaCompo = $this->_getEventDayCriteria($day, $month, $year, $cat); - - break; - - case _EXTCAL_EVENTS_YEAR: - $criteriaCompo = $this->_getEventYearCriteria($year, $cat); - break; - - case _EXTCAL_EVENTS_UPCOMING: - $criteriaCompo = $this->_getEventWeekCriteria($day, $month, $year, $cat, $nbDays); - break; - - } - //-------------------------------------------------------------------------- - $criteriaCompo->add(new Criteria('event_isrecur', 0, '=')); - $criteriaCompo->setOrder($sens); - - $result = $this->getObjects($criteriaCompo); - $events = $this->objectToArray($result, $externalKeys); - $this->serverTimeToUserTimes($events); - - return $events; - - } - - /***************************************************************** - * evennement récurents - **************************************************************** - * @param $criteres - * @return array -*/ - - function getEventsRecurents($criteres) - { - global $extcalConfig; - - while (list($k, $v) = each($criteres)) { - $$k = $v; - } - if (!isset($nbDays)) { - $nbDays = 7; - } - if (!isset($sens)) { - $sens = 'ASC'; - } - if (!isset($externalKeys)) { - $externalKeys = array('cat_id'); - } - $user = $GLOBALS['xoopsUser']; - //------------------------------------------------------ - - $criteriaCompo = new CriteriaCompo(); - - switch ($periode) { - case _EXTCAL_EVENTS_WEEK: - case _EXTCAL_EVENTS_CALENDAR_WEEK: - case _EXTCAL_EVENTS_AGENDA_WEEK: - case _EXTCAL_EVENTS_UPCOMING: - $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user)); - $end = userTimeToServerTime( - mktime( - 0, - 0, - 0, - $month, - $day + $nbDays + 1, - $year - ), - $this->_extcalTime->_getUserTimeZone($user) - ); - //$end = $start + (($nbDays + 1 )* _EXTCAL_TS_DAY); - //$end = userTimeToServerTime(mktime(0, 0, 0, $month, $day+(($nbJours)+1 * _EXTCAL_TS_DAY), $year), $this->_extcalTime->_getUserTimeZone($user));; - break; - - case _EXTCAL_EVENTS_MONTH: - case _EXTCAL_EVENTS_CALENDAR_MONTH: - $start = userTimeToServerTime(mktime(0, 0, 0, $month, 1, $year), $this->_extcalTime->_getUserTimeZone($user)); - $end = userTimeToServerTime( - mktime(23, 59, 59, $month + 1, 1, $year) - _EXTCAL_TS_DAY, - $this->_extcalTime->_getUserTimeZone($user) - ); - - $criteriaCompo->add(new Criteria('event_start', $end, '<=')); - //$criteriaCompo->add(new Criteria('event_end', $start, '>=')); - - break; - - case _EXTCAL_EVENTS_DAY: - $start = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user)); - $end = userTimeToServerTime( - mktime( - 0, - 0, - 0, - $month, - $day + 1, - $year - ), - $this->_extcalTime->_getUserTimeZone($user) - );; - //$criteriaCompo->add(new Criteria('event_start', $end, '<=')); - - break; - - case _EXTCAL_EVENTS_YEAR: - $start = userTimeToServerTime(mktime(0, 0, 0, 1, 1, $year), $this->_extcalTime->_getUserTimeZone($user)); - $end = userTimeToServerTime(mktime(0, 0, 0, 12, 31, $year), $this->_extcalTime->_getUserTimeZone($user)); - break; - - } - $formatDate = $extcalConfig['event_date_week']; - //-------------------------------------------------------------------------- - $criteriaCompo->add(new Criteria('event_isrecur', 1, '=')); - $criteriaCompo->setOrder($sens); - - $result = $this->getObjects($criteriaCompo); - $events = $this->objectToArray($result, $externalKeys); - $this->serverTimeToUserTimes($events); - - //Balyage de tous les evennements récurrents et creation de toutes le events - $eventsR = array(); - while (list($k, $event) = each($events)) { - //$te = $this->GetInterval($event, $start, $end); - //$eventsR = array_merge($eventsR, $te); - //echo 'event : ' . $event['event_id'] . '<br>'; - //ext_echoArray($event); - $recurEvents = $this->getRecurEventToDisplay($event, $start, $end); - if (count($recurEvents) > 0) { - $eventsR = array_merge($eventsR, $recurEvents); - } - - // Formating date - //$eventsR = array_merge($eventsArray, $recurEvents); - - } - - return $eventsR; - - } - - /***************************************************************** - * - **************************************************************** - * @param $period - * @param string $caption -*/ - function echoDateArray($period, $caption = '') - { - if ($caption != '') { - echo "<hr>echoDateArray -> {$caption}<br>"; - } else { - echo "<hr>echoDateArray<br>"; - } - - reset($period); - foreach ( - $period as $dt - ) { - echo $dt->format("l d-m-Y H:i:s\n") . '<br>'; - } - - } - - /***************************************************************** - * Criteria - **************************************************************** - * @param $day - * @param $month - * @param $year - * @param int $cat - * @return \CriteriaCompo -*/ - // Return the criteria compo object for a day - function _getEventDayCriteria($day, $month, $year, $cat = 0) - { - - $user = $GLOBALS['xoopsUser']; - - $dayStart = userTimeToServerTime(mktime(0, 0, 0, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user)); - $dayEnd = userTimeToServerTime(mktime(23, 59, 59, $month, $day, $year), $this->_extcalTime->_getUserTimeZone($user)); - $criteriaCompo = $this->_getListCriteriaCompo($dayStart, $dayEnd, $cat, $user); - - return $criteriaCompo; - } - - // Return the criteria compo object for a week - /** - * @param $day - * @param $month - * @param $year - * @param $cat - * @param int $nbDays - * - * @return CriteriaCompo - */ - function _getEventWeekCriteria($day, $month, $year, $cat, $nbDays = 7) - { - - $user = $GLOBALS['xoopsUser']; - - $userStartTime = mktime(0, 0, 0, $month, $day, $year); - $userEndTime = $userStartTime + (_EXTCAL_TS_DAY * $nbDays); - $weekStart = userTimeToServerTime($userStartTime, $this->_extcalTime->_getUserTimeZone($user)); - $weekEnd = userTimeToServerTime($userEndTime, $this->_extcalTime->_getUserTimeZone($user)); - $criteriaCompo = $this->_getCriteriaCompo($weekStart, $weekEnd, $cat, $user); - - ... [truncated message content] |
From: <be...@us...> - 2015-02-18 15:51:09
|
Revision: 12992 http://sourceforge.net/p/xoops/svn/12992 Author: beckmi Date: 2015-02-18 15:50:59 +0000 (Wed, 18 Feb 2015) Log Message: ----------- 2.38 RC 1 Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/changelog.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/xoops_version.php Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/changelog.txt =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/changelog.txt 2015-02-18 15:24:25 UTC (rev 12991) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/docs/changelog.txt 2015-02-18 15:50:59 UTC (rev 12992) @@ -1,462 +1,462 @@ -2.38 Beta 2 NOT RELEASD -=================================== -- moved all images, CSS, and JS files to /assets (mamba) -- renamed .html Smarty templates to .tpl (mamba) -- some changes to make it compatible with Angelo's templates for xBootstrap (mamba) - -2.38 Beta 1 2013/08/21 -=================================== -- added editor selection in Preferences for Admin and User (mamba) -- added checks if event was added/modified successfully (mamba) - -2.37 Final 2013/07/10 -=================================== -- small changes for PHP 5.4 -- fixed: removed today's events from "upcoming" block (chefry/mamba) - -2.37 RC6 2013/04/20 -=================================== -- modification of the English language files for Transifex (cesag) -- fixed: missing argument 6 for agenda_getCanevas() (cesag) -- fixed: missing phone column (Sabahan/Mamba) - -2.37 RC5 2013/01/29 -=================================== -- fixed: missing edit/delete icons for Admin in year/month/week/day view (mamba) -- fixed: missing print icons in week/day views (jcweb/mamba) -- fixed: date format in Agenda view (jcweb/mamba) -- fixed: search provides correct results (sabahan/mamba) -- added: recurring events in "Upcoming events" block (sabahan/mamba) -- changed time interval in Admin from 10 minutes to 15 minutes (playsome) - -2.37 RC4 2013/01/02 -=================================== -- fixed: removed list of events when showing first time the Search form (sabahan/mamba) -- fixed: if we disable tooltips , event title will be missing in from the calendar (sabahan/mamba) -- fixed: changed notice text when user/guest submit an event (sabahan/mamba) -- fixed: removed Price info from Print, if empty (sabahan/mamba) -- fixed: extCal didn't correctly count recurring events in Search (mamba) -- fixed: Agenda view reflects now start and end time set in Preferences (jcweb/mamba) - - -2.37 RC3 2013/01/01 -=================================== -- fixed: bug in setting recurring events for a x-day of the month, when 1st of the month is on the following day of the week. - E.g. if you select 3rd Thursday, and the first day of the month is on Friday, extCal would set the event on the 2nd Thursday -- fixed: added location info in Print, if not empty (sabahan/mamba) -- fixed: if not auto-approved, event is set as pending (sabahan/mamba) -- fixed: redirect after updating or creating an event (sabahan/mamba) - -2.37 RC2 2012/12/22 -=================================== -- fixed: attachment bug (JammerPro/mamba) -- fixed: past events not being visible consistently, when selected by user in Preferences (mamba) -- fixed: displaying the correct week in Week view when the first day of the week is Monday (mamba) -- updated: Highslide JS from version 4.1.8 to 4.1.13 (mamba) -- added: end date to blocks (sabahan/mamba) -- fixed: pagination for events in Admin (sabahan/mamba) -- fixed: Recent Activities showing all events, instead of only the particular user (sabahan/mamba) -- fixed: don't show empty Price and Organizer fields (sabahan/mamba) -- fixed: removed double edit icons (sabahan/mamba) -- fixed: removed Contact info from Print, if empty (sabahan/mamba) - -2.37 Beta 4 2012/04/02 -=================================== -- small code cleanups (mamba) -- - -2012/02/02: Version 2.37 (JJD.fr) -=================================== -- Ajout du champ icone dans la table event_event -- Ajout du chmp icone dans la table event_cat -- Affichage de l'icone de event/cat dans l'infobulle -- Mis à jour des constantes de langue -- Patch de mise à jour des tables - -2.36 (JJD.fr) 2012/01/31 -=================================== -- Fixed display -- Replacement of infobulle by another model more pro - -2.35 (JJD.fr) 2012/01/21 -=================================== -- Réintrégation file update extcal_2_34.php omitted in the previous version -- Fixed zoom in on photos to certeines -- Fixed default value of 0 in the table event_etablissement event -- Intancciation of extcalConfig <=> xoopsModuleConfig for blocks - -2.34 (JJD.fr) 2012/01/06 -=================================== - - Fixed handling of images of events and the establishment - - Fixed the RSS feed - - Fixed MOFIF regular expressions to validate dates - - Fixed link on the site of the facility - - Remove the newline before the currency in the form of the establishment - -=================================== -2011/12/30: Version 2.34 (JJD.fr) -=================================== - - Field "desc" table "establishment" renowned "description". - - Fixed template, admin and office are for schools - -2011/12/30: Version 2.33 (JJD.fr) (Google translation) -=================================== -- Re-write functions - bExtcalMinicalShow - bExtcalMinicaledit (using xoopsform) - bExtcalMinicalAddEventToArray (simplifications Code)) - -- Added a template for the xoops image display options with the mini calendar, - and knew ppression smarty code in the block miicalendrier. - -- Added constant 'CALENDAR_ROOT' file constantes.php - and removal of this statement in all the other files as - the file 'constantes.php is systematically included. - For aillerus this will ultimately move the library 'pear' - with other booksellers as jQuery, to provide for use with other modules, - library is without cete copy every time. - This library will remove the module in a future release. - It is already possible to gold and to change - define ('_EXTCAL_PEAR_CALENDAR' XOOPS_ROOT_PATH '. / modules / eXtCal / class / pear / Calendar'); - by - define ('_EXTCAL_PEAR_CALENDAR' XOOPS_PATH '. / pear / Calendar'); - If the library 'pear' is installed in the same place as jQuery. - -- Insurance for events and institutions category: - Added a link on the name to go directly to the page to change. - -- Divide the blocks in different files for easy reading and loading - Deletion of the block "excal_block.php" - Creation of blocks: - "Minical.php" - "Spotlight_events.php" - "Upcoming.php" - "Day_events.php" - "New_events.php" - "Random_events.php" - "Category_events.php" - -- Adding tabs in the data editing an event - -- Added the main menu on the left to access tabs visible - -- Pooling of lists of selection in the template "navbar" - -- Fixed CSS tooltips - Suppression of the class "*" and add the font size in "zone1" - -- Options of modules: - Added the display order of the tabs (also affects the sidebar) - Added option to position the module selection lists - -- Class event: if replacement functions below by the unique getEventOnPeriode - getEventDay, getEventWeek, getEventCalendarWeek, getEventCalendarMonth, - -- Added display of a clock flash with the mini-calendar - Adding template "clock" -Nouveau ! Cliquez sur les termes ci-dessus pour voir d'autres traductions. Ignorer -Google Traduction pour les entreprises :Google Translator ToolkitGadget TraductionOutil d'aide à l'export -Désactiver la traduction instantanéeÀ propos de Google TraductionMobileConfidentialitéAideEnvoyer des commentaires - - -=================================== -2011/10/21a: Version 2.32 (JJD.fr) -=================================== - - Fixed the "getSearchEvent" used by the search for Xoops; - It did not take into account only the first word of an expression. - In addition it has been adapted for a search from the module itself - with specific criteria (expression + category and then the month and year are expected). - The research was done on the fields 'EVENT_TITLE', 'event_desc', 'event_contact', 'EVENT_ADDRESS'. - The field 'cat_name' was added to allow the fields to search - to find words in the title of the category. - - - Added a view of research. - This allows for a wider search for a phrase, a category - over the year, month, ... - date has been changed to "DataTime" instead of int (11). - important: - Think in this tab to add those options visible in the modules. - -2011/10/21a: Version 2.31 (JJD.fr) -=================================== - - Fixed loading images in the front office - - Fixed currency and add exchange constants - define ('_MD_EXTCAL_DEVISE1', "Euro"); - define ('_MD_EXTCAL_DEVISE2', "Euros"); - define ('_MD_EXTCAL_DEVISE3', "€"); - - Changing the style sheet tooltips. - Remove the width of the class. "Tip-top" - To enable automatic resizing. - Adding attributes 'infoBulle_zone1', 'infoBulle_zone2' and 'infoBulle_zone3' - pemettre to display images and text. - 'InfoBulle_zone1': positioning the first balloon image or text - 'InfoBulle_zone2': 2nd positions the tooltip right of the first if there is an image - 'InfoBulle_zone3': 2nd positions the tool tip in the first if there is an image - To change the position of the second tooltip change 'infoBulle_zone2' - by 'infoBulle_zone3' extcal_infobulle.html in the template. - - Simplification of the template by adding generic templates - for tooltips and categories - -2011/10/21a: Version 2.30 (JJD.fr) -=================================== - - Added the removal by batch or by selection - in the administration page of events. - delete images related to the event. - -2011/09/04: Version 2.29 (JJD-fr) -==================================== -- Corrections by Trabis -- Module-wide tooltips new look in all views. -- Hiding the image seen in the "days" and "week" if it is not defined. -- Fixed formatting in views "day" and "week" and "month": " - adding the change of background color on line 10 2 - class = head for the header line, ... -- Language files "English" and "Spanish" complete -- Registration of an event on validation formular clone instead of click on the icon. -- Set the options of the module (nbeventsByPage) the number of events in the list of administration -- Add a block "Upcoming Events by category" - The block is bordered on the left and above each category by the color of the latter. - -==================================== -2011/08/22: Version 2.28 (JJD-fr) -==================================== -- Merging of "version 2.22 Plus" by Kraven with "2.27" - * Added table "etablisement" - * Entry Form for companies - * Added selection of the location of the event -- Fixed nbJours in calendar-day -- Added tooltips agenda_day in views-view-view and agenda_week -- Adjusting the input boxes of Events - -2011/08/07: Version 2.27 (Mamba) -================================= -- fixed bug with default for starting page (mamba) -- fixed event "title" for Agenda views (mamba) - -==================================== -2011/08/07: Version 2.26 (JJD-fr) -==================================== -- Fixed include constantes.php in xoops_version.php -- Fixed the block recovery xoopsModuleConfig minical -- Important: additional information in the file doc / install.txt -- Fixed language files -- Added a selection of tabs displayed in optins module. -- Correcion the link on the mini calendar. - Now shows view 'stat_page' set in options. - View 'start_page' should be visible. - -==================================== -2011/08/03: Version 2.25 (JJD-fr) -==================================== -- Added selection of tabs to display the options of the module. -- Fixed link on the mini calendar. - Now shows view 'stat_page' set in the options. - View 'start_page' should be visible. -- Add to calendar days in a grid: displays one or more days with time slots. - Events are displayed with a colored square with its title. -- Add to calendar weeks in a grid: displays one or more days with time slots. - Events are displayed with a square. - The title and start and end time are displayed in the tooltip on mouseover. - Provides a synthetic view of the week or a fortnight, for example. -- Added setting options for both views 'agenda' - * Start time of the day - * End time of the day - * Number of minutes per - * Number of days for each of the two views agenda. -- Rename all files and php template of views with the addition of the prefix 'view' for easy maintenance; -- Replacement of table '$ lang' in the template by the equivalent '$ smarty; const' -- Modification of functions and _getEventWeekCriteria getEventWeek. - addition of parameters to recover $ nbJours events on a beach - other than 7 days; '$ nbjours' must be> 0; attention to the display of more than 20 days - weeks in the calendar may not be practical. - These are the two parameters added to the options of the module; -- Added file 'agenda_fnc.php' which contains the functions for creating tables - to feed the agenda; -- Replacing the fill selection list for years, my days and categories, - by generic functions. -- Replacement of codes for the selection of views by constants (file 'constantes.php') -- Added option 'agenda_nb_years_before' and 'agenda_nb_years_after' to fill drop-down lists for selecting the year. - Can limit the previous year, for example. - - -============================ -2011/03/21: Version 2.24 -============================ - -+ Zend Coding Standard (Mamba) -+ Changed to standardized XOOPS Module GUI (mamba, Mage) -+ Spanish translation (josespi) -+ fix problem in upcoming events block (josespi) - -============================ -2008/10/09: Version 2.2.2 -============================ - -- Fix bug : Event not display in upcomming bloc if anonymous aren't allowed to view -- Fix bug : First occur for monthly reccur event could be not displayed -- Fix bug : Now, Date on RSS was replace by the event start date -- Add Flash slideshow on Minical block - - -Lang var change : - -blocks.php -_MB_EXTCAL_SS_WIDTH -_MB_EXTCAL_SS_HEIGHT -_MB_EXTCAL_SS_TRANS_TIME -_MB_EXTCAL_SS_PAUSE_TIME -_MB_EXTCAL_SS_NB_PHOTOS -_MB_EXTCAL_PX -_MB_EXTCAL_SECONDES - -============================ -2008/13/08: Version 2.2.1 -============================ - -- Fix bug : typo fix on the monthly reccur rule string -- Fix bug : 404 error when we update notifications -- Fix bug : Yearly "Same as event start date" recur option don't work. This option allow to set an event a the same day number in month as the start date. This allow to create reccuring event like birthday -- Fix bug : Member of Webmaster Group can't edit event if they aren't eXtCal edit permission -- Fix bug : Event in list view aren't sorted according to module preferences -- Fix bug : Navigation in weekly list view don't work if the first day of the week isn't Monday -- Fix bug : eXtCal upload directory isn't created when we make module update -- Fix bug : Who's not going don't work without new module install. The who's not going table isn't created when we make a module update -- Fix bug : Space in day's name on calendar pages -- Fix bug : Minical image aren't get random. -- Add Edit my event feature - - -Lang var change : - -admin.php -_AM_EXTCAL_CONFIRM_DELETE_EVENT -_AM_EXTCAL_EVENT_DELETED - -============================ -2008/14/06: Version 2.2.0 -============================ - -- Fix bug : Event year selection box don't work on year.php page -- Fix bug : Blank page when event is submitted with wrong date format -- Fix bug : Timezone offset bug on calendar pages and event page -- fix bug : Recurring bug on Monthly rule -- Fix bug : Translate error on minical day's letter - - -============================ -2008/21/05: Version 2.1.9 -============================ - -- Add tooltips box on all pages to display start and end date when mouse over the event name (need Mootools) -- Add list navig for event on admin side -- Fix bug : File isn't attached when event is submitted from admin side -- Fix bug : Timezone offset bug on block and pages - - -Lang var change : - -blocks.php -_MB_EXTCAL_DISPLAY -_MB_EXTCAL_EVENT -_MB_EXTCAL_TITLE_LENGTH - -Add mail_template directory - -============================ -2008/07/05: Version 2.1.8 -============================ - -- Add a feature to make a module update just by clicking on module admin side. The server will download, install files and update the module. -- Fix bug : User could submit event without perm by accessing directly to the submit page -- Fix bug : Recur rule aren't updated when an event is edited -- Fix bug : Timezone bug when user timezone is different than server timezone - - -============================ -2008/28/03: Version 2.1.7 -============================ - -- Fix bug : event_submitdate field wasn't created during upgrade from version before 2.0.4 -- Fix bug : wrong link when week start in month before the current view (stefan88) -- Add the send notification function -- Allow HTML for textarea fields -- Add the Comments system -- Add the Notifications system - - -============================ -2008/21/01: Version 2.1.6 -============================ - -- Fix error when submit an event from public side -- Fix Bug : Category perm are not respected to display event -- Fix Bug : Translation file isn't loaded -- Fix bug : An user could be in the who's going and who's not going list - - -============================ -2008/28/12: Version 2.1.5 -============================ - -- Add Reccuring rule description on event view -- Add the RSS page -- Extend the search function to address and contact field -- Set the update proc to upgrade from eXtCal 2.0.4 -- Add the navigation tab menu - - -============================ -2007/18/12: Version 2.1.4 -============================ - -- Add reccuring event feature - - -============================ -2007/10/07: Version 2.1.3 -============================ - -- Add a file attachement feature to the module -- Add a "who's not going" feature -- Add a version checker (display a message if a new version of the module is out) - - -============================ -2007/28/04: Version 2.1.2 -============================ - -- Add a preview feature on submit event page -- Fix a bug that disallow fresh install - - -============================ -2007/25/04: Version 2.1.1 -============================ - -- Add the "hide past event" feature - - -============================ -2007/22/04: Version 2.1.0 -============================ - -- Rewrite the module from scratch - - -============================ -2006/11/04: Version 2.0.4 RC2 -============================ - -- Add the possibility to display more than 1 event on spotlight bloc -- Bug fix : eXtCal don't work with XOOPS under 2.0.15 - - -============================ -2006/31/10: Version 2.0.4 RC1 -============================ - -- Add a "flat" monthly view -- Little display improvement -- Fix an error on pruning page -- Add property to event to set a maximum member limit per event -- Change the month template to display all event's infos +2.38 RC 1 NOT RELEASED +=================================== +- moved all images, CSS, and JS files to /assets (mamba) +- renamed .html Smarty templates to .tpl (mamba) +- some changes to make it compatible with Angelo's templates for xBootstrap (mamba) + +2.38 Beta 1 2013/08/21 +=================================== +- added editor selection in Preferences for Admin and User (mamba) +- added checks if event was added/modified successfully (mamba) + +2.37 Final 2013/07/10 +=================================== +- small changes for PHP 5.4 +- fixed: removed today's events from "upcoming" block (chefry/mamba) + +2.37 RC6 2013/04/20 +=================================== +- modification of the English language files for Transifex (cesag) +- fixed: missing argument 6 for agenda_getCanevas() (cesag) +- fixed: missing phone column (Sabahan/Mamba) + +2.37 RC5 2013/01/29 +=================================== +- fixed: missing edit/delete icons for Admin in year/month/week/day view (mamba) +- fixed: missing print icons in week/day views (jcweb/mamba) +- fixed: date format in Agenda view (jcweb/mamba) +- fixed: search provides correct results (sabahan/mamba) +- added: recurring events in "Upcoming events" block (sabahan/mamba) +- changed time interval in Admin from 10 minutes to 15 minutes (playsome) + +2.37 RC4 2013/01/02 +=================================== +- fixed: removed list of events when showing first time the Search form (sabahan/mamba) +- fixed: if we disable tooltips , event title will be missing in from the calendar (sabahan/mamba) +- fixed: changed notice text when user/guest submit an event (sabahan/mamba) +- fixed: removed Price info from Print, if empty (sabahan/mamba) +- fixed: extCal didn't correctly count recurring events in Search (mamba) +- fixed: Agenda view reflects now start and end time set in Preferences (jcweb/mamba) + + +2.37 RC3 2013/01/01 +=================================== +- fixed: bug in setting recurring events for a x-day of the month, when 1st of the month is on the following day of the week. + E.g. if you select 3rd Thursday, and the first day of the month is on Friday, extCal would set the event on the 2nd Thursday +- fixed: added location info in Print, if not empty (sabahan/mamba) +- fixed: if not auto-approved, event is set as pending (sabahan/mamba) +- fixed: redirect after updating or creating an event (sabahan/mamba) + +2.37 RC2 2012/12/22 +=================================== +- fixed: attachment bug (JammerPro/mamba) +- fixed: past events not being visible consistently, when selected by user in Preferences (mamba) +- fixed: displaying the correct week in Week view when the first day of the week is Monday (mamba) +- updated: Highslide JS from version 4.1.8 to 4.1.13 (mamba) +- added: end date to blocks (sabahan/mamba) +- fixed: pagination for events in Admin (sabahan/mamba) +- fixed: Recent Activities showing all events, instead of only the particular user (sabahan/mamba) +- fixed: don't show empty Price and Organizer fields (sabahan/mamba) +- fixed: removed double edit icons (sabahan/mamba) +- fixed: removed Contact info from Print, if empty (sabahan/mamba) + +2.37 Beta 4 2012/04/02 +=================================== +- small code cleanups (mamba) +- + +2012/02/02: Version 2.37 (JJD.fr) +=================================== +- Ajout du champ icone dans la table event_event +- Ajout du chmp icone dans la table event_cat +- Affichage de l'icone de event/cat dans l'infobulle +- Mis à jour des constantes de langue +- Patch de mise à jour des tables + +2.36 (JJD.fr) 2012/01/31 +=================================== +- Fixed display +- Replacement of infobulle by another model more pro + +2.35 (JJD.fr) 2012/01/21 +=================================== +- Réintrégation file update extcal_2_34.php omitted in the previous version +- Fixed zoom in on photos to certeines +- Fixed default value of 0 in the table event_etablissement event +- Intancciation of extcalConfig <=> xoopsModuleConfig for blocks + +2.34 (JJD.fr) 2012/01/06 +=================================== + - Fixed handling of images of events and the establishment + - Fixed the RSS feed + - Fixed MOFIF regular expressions to validate dates + - Fixed link on the site of the facility + - Remove the newline before the currency in the form of the establishment + +=================================== +2011/12/30: Version 2.34 (JJD.fr) +=================================== + - Field "desc" table "establishment" renowned "description". + - Fixed template, admin and office are for schools + +2011/12/30: Version 2.33 (JJD.fr) (Google translation) +=================================== +- Re-write functions + bExtcalMinicalShow + bExtcalMinicaledit (using xoopsform) + bExtcalMinicalAddEventToArray (simplifications Code)) + +- Added a template for the xoops image display options with the mini calendar, + and knew ppression smarty code in the block miicalendrier. + +- Added constant 'CALENDAR_ROOT' file constantes.php + and removal of this statement in all the other files as + the file 'constantes.php is systematically included. + For aillerus this will ultimately move the library 'pear' + with other booksellers as jQuery, to provide for use with other modules, + library is without cete copy every time. + This library will remove the module in a future release. + It is already possible to gold and to change + define ('_EXTCAL_PEAR_CALENDAR' XOOPS_ROOT_PATH '. / modules / eXtCal / class / pear / Calendar'); + by + define ('_EXTCAL_PEAR_CALENDAR' XOOPS_PATH '. / pear / Calendar'); + If the library 'pear' is installed in the same place as jQuery. + +- Insurance for events and institutions category: + Added a link on the name to go directly to the page to change. + +- Divide the blocks in different files for easy reading and loading + Deletion of the block "excal_block.php" + Creation of blocks: + "Minical.php" + "Spotlight_events.php" + "Upcoming.php" + "Day_events.php" + "New_events.php" + "Random_events.php" + "Category_events.php" + +- Adding tabs in the data editing an event + +- Added the main menu on the left to access tabs visible + +- Pooling of lists of selection in the template "navbar" + +- Fixed CSS tooltips + Suppression of the class "*" and add the font size in "zone1" + +- Options of modules: + Added the display order of the tabs (also affects the sidebar) + Added option to position the module selection lists + +- Class event: if replacement functions below by the unique getEventOnPeriode + getEventDay, getEventWeek, getEventCalendarWeek, getEventCalendarMonth, + +- Added display of a clock flash with the mini-calendar + Adding template "clock" +Nouveau ! Cliquez sur les termes ci-dessus pour voir d'autres traductions. Ignorer +Google Traduction pour les entreprises :Google Translator ToolkitGadget TraductionOutil d'aide à l'export +Désactiver la traduction instantanéeÀ propos de Google TraductionMobileConfidentialitéAideEnvoyer des commentaires + + +=================================== +2011/10/21a: Version 2.32 (JJD.fr) +=================================== + - Fixed the "getSearchEvent" used by the search for Xoops; + It did not take into account only the first word of an expression. + In addition it has been adapted for a search from the module itself + with specific criteria (expression + category and then the month and year are expected). + The research was done on the fields 'EVENT_TITLE', 'event_desc', 'event_contact', 'EVENT_ADDRESS'. + The field 'cat_name' was added to allow the fields to search + to find words in the title of the category. + + - Added a view of research. + This allows for a wider search for a phrase, a category + over the year, month, ... + date has been changed to "DataTime" instead of int (11). + important: + Think in this tab to add those options visible in the modules. + +2011/10/21a: Version 2.31 (JJD.fr) +=================================== + - Fixed loading images in the front office + - Fixed currency and add exchange constants + define ('_MD_EXTCAL_DEVISE1', "Euro"); + define ('_MD_EXTCAL_DEVISE2', "Euros"); + define ('_MD_EXTCAL_DEVISE3', "€"); + - Changing the style sheet tooltips. + Remove the width of the class. "Tip-top" + To enable automatic resizing. + Adding attributes 'infoBulle_zone1', 'infoBulle_zone2' and 'infoBulle_zone3' + pemettre to display images and text. + 'InfoBulle_zone1': positioning the first balloon image or text + 'InfoBulle_zone2': 2nd positions the tooltip right of the first if there is an image + 'InfoBulle_zone3': 2nd positions the tool tip in the first if there is an image + To change the position of the second tooltip change 'infoBulle_zone2' + by 'infoBulle_zone3' extcal_infobulle.html in the template. + - Simplification of the template by adding generic templates + for tooltips and categories + +2011/10/21a: Version 2.30 (JJD.fr) +=================================== + - Added the removal by batch or by selection + in the administration page of events. + delete images related to the event. + +2011/09/04: Version 2.29 (JJD-fr) +==================================== +- Corrections by Trabis +- Module-wide tooltips new look in all views. +- Hiding the image seen in the "days" and "week" if it is not defined. +- Fixed formatting in views "day" and "week" and "month": " + adding the change of background color on line 10 2 + class = head for the header line, ... +- Language files "English" and "Spanish" complete +- Registration of an event on validation formular clone instead of click on the icon. +- Set the options of the module (nbeventsByPage) the number of events in the list of administration +- Add a block "Upcoming Events by category" + The block is bordered on the left and above each category by the color of the latter. + +==================================== +2011/08/22: Version 2.28 (JJD-fr) +==================================== +- Merging of "version 2.22 Plus" by Kraven with "2.27" + * Added table "etablisement" + * Entry Form for companies + * Added selection of the location of the event +- Fixed nbJours in calendar-day +- Added tooltips agenda_day in views-view-view and agenda_week +- Adjusting the input boxes of Events + +2011/08/07: Version 2.27 (Mamba) +================================= +- fixed bug with default for starting page (mamba) +- fixed event "title" for Agenda views (mamba) + +==================================== +2011/08/07: Version 2.26 (JJD-fr) +==================================== +- Fixed include constantes.php in xoops_version.php +- Fixed the block recovery xoopsModuleConfig minical +- Important: additional information in the file doc / install.txt +- Fixed language files +- Added a selection of tabs displayed in optins module. +- Correcion the link on the mini calendar. + Now shows view 'stat_page' set in options. + View 'start_page' should be visible. + +==================================== +2011/08/03: Version 2.25 (JJD-fr) +==================================== +- Added selection of tabs to display the options of the module. +- Fixed link on the mini calendar. + Now shows view 'stat_page' set in the options. + View 'start_page' should be visible. +- Add to calendar days in a grid: displays one or more days with time slots. + Events are displayed with a colored square with its title. +- Add to calendar weeks in a grid: displays one or more days with time slots. + Events are displayed with a square. + The title and start and end time are displayed in the tooltip on mouseover. + Provides a synthetic view of the week or a fortnight, for example. +- Added setting options for both views 'agenda' + * Start time of the day + * End time of the day + * Number of minutes per + * Number of days for each of the two views agenda. +- Rename all files and php template of views with the addition of the prefix 'view' for easy maintenance; +- Replacement of table '$ lang' in the template by the equivalent '$ smarty; const' +- Modification of functions and _getEventWeekCriteria getEventWeek. + addition of parameters to recover $ nbJours events on a beach + other than 7 days; '$ nbjours' must be> 0; attention to the display of more than 20 days + weeks in the calendar may not be practical. + These are the two parameters added to the options of the module; +- Added file 'agenda_fnc.php' which contains the functions for creating tables + to feed the agenda; +- Replacing the fill selection list for years, my days and categories, + by generic functions. +- Replacement of codes for the selection of views by constants (file 'constantes.php') +- Added option 'agenda_nb_years_before' and 'agenda_nb_years_after' to fill drop-down lists for selecting the year. + Can limit the previous year, for example. + + +============================ +2011/03/21: Version 2.24 +============================ + ++ Zend Coding Standard (Mamba) ++ Changed to standardized XOOPS Module GUI (mamba, Mage) ++ Spanish translation (josespi) ++ fix problem in upcoming events block (josespi) + +============================ +2008/10/09: Version 2.2.2 +============================ + +- Fix bug : Event not display in upcomming bloc if anonymous aren't allowed to view +- Fix bug : First occur for monthly reccur event could be not displayed +- Fix bug : Now, Date on RSS was replace by the event start date +- Add Flash slideshow on Minical block + + +Lang var change : + +blocks.php +_MB_EXTCAL_SS_WIDTH +_MB_EXTCAL_SS_HEIGHT +_MB_EXTCAL_SS_TRANS_TIME +_MB_EXTCAL_SS_PAUSE_TIME +_MB_EXTCAL_SS_NB_PHOTOS +_MB_EXTCAL_PX +_MB_EXTCAL_SECONDES + +============================ +2008/13/08: Version 2.2.1 +============================ + +- Fix bug : typo fix on the monthly reccur rule string +- Fix bug : 404 error when we update notifications +- Fix bug : Yearly "Same as event start date" recur option don't work. This option allow to set an event a the same day number in month as the start date. This allow to create reccuring event like birthday +- Fix bug : Member of Webmaster Group can't edit event if they aren't eXtCal edit permission +- Fix bug : Event in list view aren't sorted according to module preferences +- Fix bug : Navigation in weekly list view don't work if the first day of the week isn't Monday +- Fix bug : eXtCal upload directory isn't created when we make module update +- Fix bug : Who's not going don't work without new module install. The who's not going table isn't created when we make a module update +- Fix bug : Space in day's name on calendar pages +- Fix bug : Minical image aren't get random. +- Add Edit my event feature + + +Lang var change : + +admin.php +_AM_EXTCAL_CONFIRM_DELETE_EVENT +_AM_EXTCAL_EVENT_DELETED + +============================ +2008/14/06: Version 2.2.0 +============================ + +- Fix bug : Event year selection box don't work on year.php page +- Fix bug : Blank page when event is submitted with wrong date format +- Fix bug : Timezone offset bug on calendar pages and event page +- fix bug : Recurring bug on Monthly rule +- Fix bug : Translate error on minical day's letter + + +============================ +2008/21/05: Version 2.1.9 +============================ + +- Add tooltips box on all pages to display start and end date when mouse over the event name (need Mootools) +- Add list navig for event on admin side +- Fix bug : File isn't attached when event is submitted from admin side +- Fix bug : Timezone offset bug on block and pages + + +Lang var change : + +blocks.php +_MB_EXTCAL_DISPLAY +_MB_EXTCAL_EVENT +_MB_EXTCAL_TITLE_LENGTH + +Add mail_template directory + +============================ +2008/07/05: Version 2.1.8 +============================ + +- Add a feature to make a module update just by clicking on module admin side. The server will download, install files and update the module. +- Fix bug : User could submit event without perm by accessing directly to the submit page +- Fix bug : Recur rule aren't updated when an event is edited +- Fix bug : Timezone bug when user timezone is different than server timezone + + +============================ +2008/28/03: Version 2.1.7 +============================ + +- Fix bug : event_submitdate field wasn't created during upgrade from version before 2.0.4 +- Fix bug : wrong link when week start in month before the current view (stefan88) +- Add the send notification function +- Allow HTML for textarea fields +- Add the Comments system +- Add the Notifications system + + +============================ +2008/21/01: Version 2.1.6 +============================ + +- Fix error when submit an event from public side +- Fix Bug : Category perm are not respected to display event +- Fix Bug : Translation file isn't loaded +- Fix bug : An user could be in the who's going and who's not going list + + +============================ +2008/28/12: Version 2.1.5 +============================ + +- Add Reccuring rule description on event view +- Add the RSS page +- Extend the search function to address and contact field +- Set the update proc to upgrade from eXtCal 2.0.4 +- Add the navigation tab menu + + +============================ +2007/18/12: Version 2.1.4 +============================ + +- Add reccuring event feature + + +============================ +2007/10/07: Version 2.1.3 +============================ + +- Add a file attachement feature to the module +- Add a "who's not going" feature +- Add a version checker (display a message if a new version of the module is out) + + +============================ +2007/28/04: Version 2.1.2 +============================ + +- Add a preview feature on submit event page +- Fix a bug that disallow fresh install + + +============================ +2007/25/04: Version 2.1.1 +============================ + +- Add the "hide past event" feature + + +============================ +2007/22/04: Version 2.1.0 +============================ + +- Rewrite the module from scratch + + +============================ +2006/11/04: Version 2.0.4 RC2 +============================ + +- Add the possibility to display more than 1 event on spotlight bloc +- Bug fix : eXtCal don't work with XOOPS under 2.0.15 + + +============================ +2006/31/10: Version 2.0.4 RC1 +============================ + +- Add a "flat" monthly view +- Little display improvement +- Fix an error on pruning page +- Add property to event to set a maximum member limit per event +- Change the month template to display all event's infos Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/xoops_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/xoops_version.php 2015-02-18 15:24:25 UTC (rev 12991) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/extcal/xoops_version.php 2015-02-18 15:50:59 UTC (rev 12992) @@ -35,7 +35,7 @@ //*************************************************************************************** //about -$modversion["module_status"] = "Beta 2"; +$modversion["module_status"] = "RC 1"; $modversion["release_date"] = "2014/04/23"; $modversion["module_website_url"] = "www.xoops.org/"; $modversion["module_website_name"] = "XOOPS"; |