Menu
▾
▴
xoops-svn
|
From: <al...@us...> - 2013-06-17 17:17:06
|
Revision: 11711
http://sourceforge.net/p/xoops/svn/11711
Author: alain91
Date: 2013-06-17 17:16:51 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
version apres psr tool
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/functions.admin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/functions.cache.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/functions.config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/functions.ini.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/functions.locale.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/functions.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/object.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/art/xoopsart.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/Frameworks/textsanitizer/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/admin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/backend.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/browse.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/auth/auth.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/auth/auth_ads.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/auth/auth_ldap.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/auth/auth_provisionning.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/auth/auth_xoops.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/auth/authfactory.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/cache/apc.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/cache/file.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/cache/memcache.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/cache/model.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/cache/xcache.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/cache/xoopscache.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/config.image.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/config.recaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/config.text.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/image/scripts/image.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/image.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha/recaptchalib.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/text.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/class.tar.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/class.zipfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/criteria.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/database.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/manager.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/mysqldatabase.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/sqlutility.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/downloader.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/file/file.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/file/folder.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/file/xoopsfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/logger/xoopslogger.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/class.phpmailer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/class.pop3.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/class.smtp.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-ar.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-br.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-ca.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-cz.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-de.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-dk.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-en.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-es.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-et.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-fi.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-fo.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-fr.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-hu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-it.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-ja.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-nl.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-no.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-pl.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-ro.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-ru.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-se.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/phpmailer/language/phpmailer.lang-tr.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/model/joint.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/model/read.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/model/stats.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/model/sync.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/model/write.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/model/xoopsmodel.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/moduleadmin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/pagenav.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/preload.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/snoopy.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/tardownloader.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/template.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/censor/censor.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/censor/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/config.custom.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/flash/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/flash/flash.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/iframe/iframe.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/image/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/image/image.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/li/li.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/mms/mms.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/mp3/mp3.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/rtsp/rtsp.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/syntaxhighlight/syntaxhighlight.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/textfilter/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/textfilter/textfilter.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/ul/ul.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/wiki/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/wiki/wiki.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/wmp/wmp.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/textsanitizer/youtube/youtube.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/theme.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/theme_blocks.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/tree.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/uploader.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/userutility.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rpc/bloggerapi.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rpc/metaweblogapi.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rpc/movabletypeapi.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rpc/xmlrpcapi.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rpc/xmlrpcparser.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rpc/xmlrpctag.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rpc/xoopsapi.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/rss/xmlrss2parser.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/saxparser.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/themesetparser.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xml/xmltaghandler.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/dhtmltextarea/dhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/dhtmltextarea/editor_registry.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/dhtmltextarea/language/english.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/textarea/editor_registry.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/textarea/language/english.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/textarea/textarea.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/editor_registry.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/include/xoops_images.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/include/xoops_smilies.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/include/xoops_xlanguage.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/settings.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_code/xoops_code.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_images/xoops_images.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_quote/xoops_quote.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_smilies/xoops_smilies.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/tiny_mce/plugins/xoops_xlanguage/xoops_xlanguage.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/tinymce/tinymce.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/xoopseditor.inc.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/blockform.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/form.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formbutton.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formbuttontray.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formcaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formcontainer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formdatetime.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formeditor.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formelement.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formelementtray.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formhidden.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formhiddentoken.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formlabel.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formmail.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formpassword.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formradio.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formradioyn.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formraw.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselect.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselectcheckgroup.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselectcountry.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselectgroup.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselectlang.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselectlocale.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselectmatchoption.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselecttheme.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselecttimezone.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formselectuser.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formtab.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formtabtray.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formtext.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formtextarea.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formtextdateselect.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/formurl.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/grouppermform.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/simpleform.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/tableform.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsform/themeform.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsformloader.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopslists.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsload.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopsmailer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopssecurity.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/zipdownloader.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/edituser.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/footer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/header.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/imagemanager.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/calendarjs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/cp_functions.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/cp_header.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/defines.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/findusers.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/formdhtmltextarea_preview.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/functions.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/mimetypes.inc.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/registerform.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/site-closed.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/version.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/index.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/class/installwizard.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/class/pathcontroller.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/include/common.inc.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/include/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/include/createconfigform.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/include/functions.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/include/install_tpl.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/include/page.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/index.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/locale/en_US/finish.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/locale/en_US/install.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/locale/en_US/install2.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/locale/en_US/support.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/locale/en_US/welcome.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_configsave.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_configsite.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_dbconnection.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_dbsettings.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_end.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_extensioninstaller.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_langselect.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_modcheck.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_moduleinstaller.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_pathsettings.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_siteinit.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_start.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_tablesfill.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/install/page_theme.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/blockmodulelink.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/cachemodel.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/configcategory.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/configitem.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/configoption.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/group.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/groupperm.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/member.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/membership.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/module.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/online.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/privmessage.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/ranks.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/tplfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/tplset.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/user.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_admin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_auth.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_backend.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_calendar.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_captcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_comment.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_countries.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_database.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_errors.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_findusers.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_formdhtmltextarea.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_global.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_locale.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_logger.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_mail.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_misc.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_notification.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_pmsg.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_search.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_timezone.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_uploader.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_user.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/language/english/_xoopsmailerlocal.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/locale/en_US/locale.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/locale/en_US/mailer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/lostpass.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.dist.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/misc.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/admin/about.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/admin/avatar_custom.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/admin/avatar_system.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/admin/header.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/admin/index.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/class/avatar.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/class/form/avatar.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/class/form/avatar_user.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/class/helper.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/class/userlink.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/editavatar.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/include/install.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/locale/en_US/locale.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/popup.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/admin/about.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/admin/banners.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/admin/clients.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/admin/header.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/admin/index.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/admin/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/blocks/banners_blocks.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/class/banner.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/class/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/class/bannerrender.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/class/form/banner.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/class/form/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/class/helper.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/include/install.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/index.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/language/english/blocks.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/xoops_version.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/alert.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/backend.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/cache.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/class/plugin/search.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/class/plugin/system.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/class/plugin/userconfigs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/form-tab.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/form.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/language/english/main.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/language/english/modinfo.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/menus-plugin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/module-helper.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/pdf.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/qrcode.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/system-plugin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/codex/userconfigs.php
XoopsCore/bra...
[truncated message content] |
|
From: <al...@us...> - 2013-06-18 19:05:47
|
Revision: 11716
http://sourceforge.net/p/xoops/svn/11716
Author: alain91
Date: 2013-06-18 19:05:44 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Some fixes to unit tests bugs
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -45,12 +45,12 @@
require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php';
$form = "<script type=\"text/javascript\">
var RecaptchaOptions = {
- theme : '" . $this->config['theme'] . "',
- lang : '" . $this->config['lang'] . "'
+ theme : '" . (empty($this->config['theme']) ? '' : $this->config['theme']) . "',
+ lang : '" . (empty($this->config['lang']) ? '' : $this->config['lang']) . "'
};
</script>";
- $form .= recaptcha_get_html($this->config['public_key']);
-
+ $public_key = empty($this->config['public_key']) ? '' : $this->config['public_key'];
+ $form .= recaptcha_get_html($public_key);
return $form;
}
@@ -60,7 +60,7 @@
* @param $sessionName
* @return bool
*/
- public function verify($sessionName)
+ public function verify($sessionName = null)
{
$is_valid = false;
require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php';
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -494,9 +494,12 @@
*/
public function loadConfig($name = '')
{
- $this->config = empty($name) ? $this->handler->config
- : array_merge($this->handler->config, $this->handler->loadConfig($name));
-
+ if (!is_object($this->handler))
+ $this->config = array();
+ else
+ $this->config = empty($name)
+ ? $this->handler->config
+ : array_merge($this->handler->config, $this->handler->loadConfig($name));
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -82,8 +82,7 @@
} else {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
}
- unset($database);
- $database = new $class();
+ $database = new $class();
} else {
trigger_error('notrace:Failed to load database of type: ' . XOOPS_DB_TYPE . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -104,7 +104,7 @@
{
if (is_array($config_custom)) {
foreach ($config_custom as $key => $val) {
- if (is_array($config_default[$key])) {
+ if (array_key_exists($key,$config_default) AND is_array($config_default[$key])) {
$config_default[$key] = self::mergeConfig($config_default[$key], $config_custom[$key]);
} else {
$config_default[$key] = $val;
@@ -330,9 +330,11 @@
if (empty($text) || empty($instance->config['truncate_length']) || strlen($text) < $instance->config['truncate_length']) {
return $text;
}
- $len = floor($instance->config['truncate_length'] / 2);
- $ret = substr($text, 0, $len) . ' ... ' . substr($text, 5 - $len);
-
+ $len = (((strlen($text) - $instance->config['truncate_length']) - 5) / 2);
+ if ($len < 5)
+ $ret = substr($text, 0, $len) . ' ... ' . substr($text, -$len);
+ else
+ $ret = substr($text,0,$instance->config['truncate_length']);
return $ret;
}
@@ -352,7 +354,7 @@
$replacements[] = '<a href="' . XOOPS_URL . '/\\2" title="">\\3</a>';
$patterns[] = "/\[url=(['\"]?)(http[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
$replacements[] = '<a href="\\2" rel="external" title="">\\3</a>';
- $patterns[] = "/\[url=(['\"]?)(ftp?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
+ $patterns[] = "/\[url=(['\"]?)(ftp[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
$replacements[] = '<a href="\\2" rel="external" title="">\\3</a>';
$patterns[] = "/\[url=(['\"]?)([^'\"<>]*)\\1](.*)\[\/url\]/sU";
$replacements[] = '<a href="http://\\2" rel="external" title="">\\3</a>';
@@ -661,7 +663,7 @@
return false;
}
$class = 'Myts' . ucfirst($name);
- if (!class_exists($class)) {
+ if (!class_exists($class,false)) {
trigger_error("Extension '{$name}' does not exist", E_USER_WARNING);
return false;
@@ -681,6 +683,7 @@
public function executeExtension($name)
{
$extension = $this->loadExtension($name);
+ if (!$extension) return false;
$args = array_slice(func_get_args(), 1);
return call_user_func_array(array($extension , 'load'), array_merge(array(&$this), $args));
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -35,10 +35,8 @@
public static function recursive($handler, $data)
{
if (is_array($data)) {
- $return = array_map(array(
- 'XoopsUtility' ,
- 'recursive'), $handler, $data);
-
+ $return = array_map(array('XoopsUtility', 'recursive'),
+ array_fill(0, count($data), $handler), $data);
return $return;
}
// single function
@@ -46,10 +44,8 @@
return function_exists($handler) ? $handler($data) : $data;
}
// Method of a class
- if (is_array($handler)) {
- return call_user_func(array(
- $handler[0] ,
- $handler[1]), $data);
+ if (is_callable($handler)) {
+ return call_user_func($handler, $data);
}
return $data;
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -290,27 +290,23 @@
// T : use text sanitizater (smilies disabled)
if ($c_type == 'H') {
return str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
- } else {
- if ($c_type == 'P') {
- ob_start();
- echo eval($this->getVar('content', 'n'));
- $content = ob_get_contents();
- ob_end_clean();
+ } elseif ($c_type == 'P') {
+ ob_start();
+ echo eval($this->getVar('content', 'n'));
+ $content = ob_get_contents();
+ ob_end_clean();
- return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
- } else {
- if ($c_type == 'S') {
- $myts = MyTextSanitizer::getInstance();
- $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+ return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
+ } elseif ($c_type == 'S') {
+ $myts = MyTextSanitizer::getInstance();
+ $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
- return $myts->displayTarea($content, 1, 1);
- } else {
- $myts = MyTextSanitizer::getInstance();
- $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+ return $myts->displayTarea($content, 1, 1);
+ } else {
+ $myts = MyTextSanitizer::getInstance();
+ $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
- return $myts->displayTarea($content, 1, 0);
- }
- }
+ return $myts->displayTarea($content, 1, 0);
}
break;
case 'e':
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -138,14 +138,13 @@
{
$sess_id = $this->db->quoteString($sess_id);
$sql = sprintf('UPDATE %s SET sess_updated = %u, sess_data = %s WHERE sess_id = %s', $this->db->prefix('session'), time(), $this->db->quoteString($sess_data), $sess_id);
- $this->db->queryF($sql);
- if (!$this->db->getAffectedRows()) {
+ $result = $this->db->queryF($sql);
+ if ($this->db->getAffectedRows() <= 0) {
$sql = sprintf('INSERT INTO %s (sess_id, sess_updated, sess_ip, sess_data) VALUES (%s, %u, %s, %s)', $this->db->prefix('session'), $sess_id, time(), $this->db->quoteString($_SERVER['REMOTE_ADDR']), $this->db->quoteString($sess_data));
-
- return $this->db->queryF($sql);
+ $result = $this->db->queryF($sql);
}
- return true;
+ return (false !== $result);
}
/**
@@ -265,6 +264,6 @@
$session_name = ($xoops->getConfig('use_mysession') && $xoops->getConfig('session_name') != '') ? $xoops->getConfig('session_name') : session_name();
$session_expire = !is_null($expire) ? intval($expire) : (($xoops->getConfig('use_mysession') && $xoops->getConfig('session_name') != '') ? $xoops->getConfig('session_expire') * 60 : ini_get("session.cookie_lifetime"));
$session_id = empty($sess_id) ? session_id() : $sess_id;
- setcookie($session_name, $session_id, $session_expire ? time() + $session_expire : 0, '/', XOOPS_COOKIE_DOMAIN, 0);
+ if (!headers_sent()) setcookie($session_name, $session_id, $session_expire ? time() + $session_expire : 0, '/', XOOPS_COOKIE_DOMAIN, 0);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -21,8 +21,7 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$xoops = Xoops::getInstance();
-XoopsLoad::loadFile($xoops->path(dirname(__FILE__) . '/include/constants.php'));
+XoopsLoad::loadFile(dirname(__FILE__) . '/include/constants.php');
$modversion['name'] = _MI_PUBLISHER_MD_NAME;
$modversion['description'] = _MI_PUBLISHER_MD_DESC;
|
|
From: <al...@us...> - 2013-06-22 19:20:28
|
Revision: 11747
http://sourceforge.net/p/xoops/svn/11747
Author: alain91
Date: 2013-06-22 19:20:25 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
Integration of patches from xoops 2.6.0 bug tracker
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/admin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/template.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopslists.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopssecurity.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/formdhtmltextarea_preview.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/tplfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/admin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Auth/Factory.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops.php
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/admin.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/admin.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -96,7 +96,7 @@
$count = count($_items);
for ($i = 0; $i < $count; $i++) {
$_items[$i]['title'] = XoopsLocale::convert_encoding($_items[$i]['title'], XoopsLocale::getCharset(), 'UTF-8');
- $_items[$i]['description'] = XoopsLocale::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8');
+ $_items[$i]['description'] = XoopsLocale::convert_encoding($_items[$i]['description'], XoopsLocale::getCharset(), 'UTF-8');
$items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i];
}
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -494,12 +494,13 @@
*/
public function loadConfig($name = '')
{
- if (!is_object($this->handler))
- $this->config = array();
- else
+ if (is_object($this->handler)) {
$this->config = empty($name)
? $this->handler->config
: array_merge($this->handler->config, $this->handler->loadConfig($name));
+ } else {
+ $this->config = array();
+ }
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/template.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/template.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/template.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -71,20 +71,16 @@
if (!function_exists('smarty_function_eval')) {
require_once SMARTY_DIR . '/plugins/function.eval.php';
}
- if (isset($vars)) {
- $oldVars = $this->_tpl_vars;
- $this->assign($vars);
- $out = smarty_function_eval(
- array('var' => $tplSource), $this
- );
- $this->_tpl_vars = $oldVars;
+ $oldVars = $this->_tpl_vars;
+ if (isset($vars)) $this->assign($vars);
+ $out = smarty_function_eval(array('var' => $tplSource), $this);
+ $this->_tpl_vars = $oldVars;
- return $out;
- }
-
- return smarty_function_eval(
- array('var' => $tplSource), $this
- );
+ if ($display) {
+ echo $out;
+ return;
+ }
+ return $out;
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopslists.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopslists.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopslists.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -189,7 +189,7 @@
$filelist = array();
if ($handle = opendir($dirname)) {
while (false !== ($file = readdir($handle))) {
- if (preg_match('/(\.gif|\.jpg|\.png|\.swf)$/i', $file)) {
+ if (preg_match('/\.(gif|jpg|png|swf)$/i', $file)) {
$file = $prefix . $file;
$filelist[$file] = $file;
}
@@ -217,7 +217,7 @@
$filelist = array();
if ($handle = opendir($dirname)) {
while (false !== ($file = readdir($handle))) {
- if ((preg_match('/(\.htm|\.html|\.xhtml)$/i', $file) && !is_dir($file))) {
+ if ((preg_match('/\.(htm|html|xhtml)$/i', $file) && !is_dir($file))) {
$file = $prefix . $file;
$filelist[$file] = $prefix . $file;
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopssecurity.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopssecurity.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/xoopssecurity.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -81,7 +81,9 @@
$log = array();
$token = ($token !== false) ? $token : (isset($_REQUEST[$name . '_REQUEST']) ? $_REQUEST[$name . '_REQUEST'] : '');
if (empty($token) || empty($_SESSION[$name . '_SESSION'])) {
- $log[] = array('Token Validation', 'No valid token found in request/session');
+ $str = 'No valid token found in request/session';
+ $this->setErrors($str);
+ $log[] = array('Token Validation', $str);
} else {
$token_data =& $_SESSION[$name . '_SESSION'];
foreach (array_keys($token_data) as $i) {
@@ -94,14 +96,16 @@
$log[] = array('Token Validation', 'Valid token found');
$ret = true;
} else {
- $str = 'Valid token expired';
+ $str = 'Valid token expired ' . $token;
$this->setErrors($str);
$log[] = array('Token Validation', $str);
}
}
}
if (!$ret) {
- $log[] = array('Token Validation', 'No valid token found');
+ $str = 'No valid token found';
+ $this->setErrors($str);
+ $log[] = array('Token Validation', $str);
}
$this->garbageCollection($name);
}
@@ -123,13 +127,13 @@
/**
* Check whether a token value is expired or not
*
- * @param string $token
+ * @param string $token_data
*
* @return bool
*/
- public function filterToken($token)
+ public function filterToken($token_data)
{
- return (!empty($token['expire']) && $token['expire'] >= time());
+ return (!empty($token_data['expire']) && $token_data['expire'] >= time());
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/checklogin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/checklogin.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/checklogin.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -62,7 +62,8 @@
$_SESSION['xoopsUserId'] = $user->getVar('uid');
$_SESSION['xoopsUserGroups'] = $user->getGroups();
$user_theme = $user->getVar('theme');
- if (in_array($user_theme, $xoops->getConfig('theme_set_allowed'))) {
+ $theme_set_allowed = $xoops->getConfig('theme_set_allowed');
+ if (empty($theme_set_allowed) OR in_array($user_theme, $theme_set_allowed)) {
$_SESSION['xoopsUserTheme'] = $user_theme;
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/formdhtmltextarea_preview.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/formdhtmltextarea_preview.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/formdhtmltextarea_preview.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -40,7 +40,8 @@
}
if (! headers_sent()) {
- header('Content-Type:text/html; charset=ISO-8859-1');
+ $charset = (is_callable() ? XoopsLocale::getCharset() : 'UTF-8');
+ header('Content-Type:text/html; charset='.$charset);
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Cache-Control: private, no-cache');
header('Pragma: no-cache');
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -334,11 +334,17 @@
if (XoopsLoad::fileExists(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file'))) {
$xoops->loadLanguage('blocks', $this->getVar('dirname'));
include_once XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file');
- $options = explode('|', $this->getVar('options'));
- $edit_form = $edit_func($options);
- if (!$edit_form) {
- return false;
- }
+
+ if (function_exists($edit_func)) {
+ // execute the function
+ $options = explode('|', $this->getVar('options'));
+ $edit_form = $edit_func($options);
+ if (!$edit_form) {
+ return false;
+ }
+ } else {
+ return false;
+ }
return $edit_form;
} else {
@@ -583,9 +589,9 @@
$where_query = " WHERE isactive=" . $isactive;
if (isset($side)) {
// get both sides in sidebox? (some themes need this)
- if ($side == 2) {
+ if ($side == XOOPS_SIDEBLOCK_BOTH) {
$side = "(side=0 OR side=1)";
- } elseif ($side == 6) {
+ } elseif ($side == XOOPS_CENTERBLOCK_ALL) {
$side = "(side=3 OR side=4 OR side=5 OR side=7 OR side=8 OR side=9)";
} else {
$side = "side=" . $side;
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/tplfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/tplfile.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/tplfile.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -387,7 +387,7 @@
public function getModuleTplCount($tplset)
{
$ret = array();
- $sql = "SELECT tpl_module, COUNT(tpl_id) AS count FROM " . $this->db->prefix('tplfile') . " WHERE tpl_tplset='" . $this->db->quoteString($tplset) . "' GROUP BY tpl_module";
+ $sql = "SELECT tpl_module, COUNT(tpl_id) AS count FROM " . $this->db->prefix('tplfile') . " WHERE tpl_tplset=" . $this->db->quoteString($tplset) . " GROUP BY tpl_module";
$result = $this->db->query($sql);
if (!$result) {
return $ret;
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/admin.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/admin.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -147,13 +147,17 @@
}
switch ($directory) {
case 'groups':
- $groups_Handler = $xoops->getHandlerGroup();
- $groups = $groups_Handler->getCount();
+ $groups_handler = $xoops->getHandlerGroup();
+ $groups = 0;
+ if (is_object($groups_handler))
+ $groups = $groups_handler->getCount();
$menu['infos'] = sprintf(SystemLocale::F_GROUPS_SPAN, $groups);
break;
case 'users':
$member_handler = $xoops->getHandlerUser();
- $member = $member_handler->getCount();
+ $member = 0;
+ if (is_object($member_handler))
+ $member = $member_handler->getCount();
$menu['infos'] = sprintf(SystemLocale::F_USERS_SPAN, $member);
break;
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Auth/Factory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Auth/Factory.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Auth/Factory.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -55,7 +55,7 @@
$xoops_auth_method = $authConfig['auth_method'];
}
// Verify if uname allow to bypass LDAP auth
- if (in_array($uname, $authConfig['ldap_users_bypass'])) {
+ if (!empty($authConfig['ldap_users_bypass']) AND in_array($uname, $authConfig['ldap_users_bypass'])) {
$xoops_auth_method = 'xoops';
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops.php 2013-06-22 18:57:31 UTC (rev 11746)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops.php 2013-06-22 19:20:25 UTC (rev 11747)
@@ -221,8 +221,14 @@
if (!$this->isAdminSide) {
$xoopsThemeFactory = null;
$xoopsThemeFactory = new XoopsThemeFactory();
- $xoopsThemeFactory->allowedThemes = $this->getConfig('theme_set_allowed');
- $xoopsThemeFactory->defaultTheme = $this->getConfig('theme_set');
+ $theme_set_allowed = $this->getConfig('theme_set_allowed');
+ if (!empty($theme_set_allowed) AND is_array($theme_set_allowed)) {
+ $xoopsThemeFactory->allowedThemes = $theme_set_allowed;
+ }
+ $theme_set = $this->getConfig('theme_set');
+ if (!empty($theme_set) AND is_string($theme_set)) {
+ $xoopsThemeFactory->defaultTheme = $theme_set;
+ }
$this->setTheme($xoopsThemeFactory->createInstance(array('contentTemplate' => $this->tpl_name)));
} else {
$adminThemeFactory = new XoopsAdminThemeFactory();
@@ -396,12 +402,18 @@
*/
public function themeSelect()
{
- if (!empty($_POST['xoops_theme_select']) && in_array($_POST['xoops_theme_select'], $this->getConfig('theme_set_allowed'))) {
- $this->setConfig('theme_set', $_POST['xoops_theme_select']);
- $_SESSION['xoopsUserTheme'] = $_POST['xoops_theme_select'];
+ if (!empty($_POST['xoops_theme_select'])) {
+ $theme_set_allowed = $this->getConfig('theme_set_allowed');
+ if (empty($theme_set_allowed) OR in_array($_POST['xoops_theme_select'], $theme_set_allowed)) {
+ $this->setConfig('theme_set', $_POST['xoops_theme_select']);
+ $_SESSION['xoopsUserTheme'] = $_POST['xoops_theme_select'];
+ }
} else {
- if (!empty($_SESSION['xoopsUserTheme']) && in_array($_SESSION['xoopsUserTheme'], $this->getConfig('theme_set_allowed'))) {
- $this->setConfig('theme_set', $_SESSION['xoopsUserTheme']);
+ if (!empty($_SESSION['xoopsUserTheme'])) {
+ $theme_set_allowed = $this->getConfig('theme_set_allowed');
+ if (empty($theme_set_allowed) OR in_array($_SESSION['xoopsUserTheme'], $theme_set_allowed)) {
+ $this->setConfig('theme_set', $_SESSION['xoopsUserTheme']);
+ }
}
}
}
|
|
From: <al...@us...> - 2013-10-06 18:36:32
|
Revision: 12152
http://sourceforge.net/p/xoops/svn/12152
Author: alain91
Date: 2013-10-06 18:36:28 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
save working version
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -269,4 +269,4 @@
//Creates 'system_modules_active' cache file if it has been deleted.
$xoops->getActiveModules();
-$xoops->preload()->triggerEvent('core.include.common.end');
+$xoopsPreload->triggerEvent('core.include.common.end');
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -676,7 +676,8 @@
*/
public function __construct(XoopsDatabase $db = null, $table = '', $className = '', $keyName = '', $identifierName = '')
{
- $db = XoopsDatabaseFactory::getDatabaseConnection();
+ if ($db == null)
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
$table = $db->prefix($table);
parent::__construct($db);
$this->table = $table;
@@ -722,7 +723,7 @@
*/
public function loadHandler($name, $args = null)
{
- static $handlers;
+ static $handlers = array();
if (!isset($handlers[$name])) {
$xmf = XoopsModelFactory::getInstance();
$handlers[$name] = $xmf->loadHandler($this, $name, $args);
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -23,13 +23,13 @@
// XOOPS Physical Paths
// Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
- define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs");
+ define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs");
// For forward compatibility
// Physical path to the XOOPS library directory WITHOUT trailing slash
- define("XOOPS_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_lib");
+ define("XOOPS_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs\xoops_lib");
// Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
- define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_data");
+ define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs\xoops_data");
// Alias of XOOPS_PATH, for compatibility, temporary solution
define("XOOPS_TRUST_PATH", XOOPS_PATH);
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,13 +29,16 @@
*/
class AvatarsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
- 'avatars' => $path . '/class/helper.php',
- ));
+ 'avatars' => $path . '/class/helper.php',
+ 'avatarsavatar' => $path . '/class/avatar.php',
+ 'avatarsuserlink' => $path . '/class/userlink.php',
+ ));
}
+
public static function eventCoreUserinfoButton($args)
{
$link = 'modules/avatars/editavatar.php';
@@ -44,3 +47,4 @@
$args[0][] = array( 'link' => $link, 'title' => $title, 'icon' => $icon);
}
}
+AvatarsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -31,13 +31,17 @@
*/
class BannersCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
'banners' => $path . '/class/helper.php',
+ 'bannersbanner' => $path . '/class/banner.php',
+ 'bannersclient' => $path . '/class/bannerclient.php',
+ 'bannersrender' => $path . '/class/bannerrender.php',
));
}
+
public static function eventCoreBannerDisplay($args)
{
require_once dirname(dirname(__FILE__)) . '/class/bannerrender.php';
@@ -45,3 +49,4 @@
$args[0] = $render->displayBanner();
}
}
+BannersCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class CommentsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -84,3 +84,4 @@
}
}
}
+CommentsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class ImagesCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -62,3 +62,4 @@
Xoops::getInstance()->redirect("modules/images/imagemanager.php?{$uri}", 0);
}
}
+ImagesCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -30,10 +30,14 @@
{
public static $registry = array();
+ public static function initialize()
+ {
+ $path = dirname(dirname(__FILE__));
+ XoopsLoad::addMap(array('logger' => $path . '/class/logger.php'));
+ }
+
public static function eventCoreIncludeCommonStart($args)
{
- //Load may fail is cache was erased
- XoopsLoad::addMap(array('logger' => dirname(dirname(__FILE__)) . '/class/logger.php'));
Logger::getInstance()->enable();//until we get a db connection debug is enabled
Logger::getInstance()->startTime();
Logger::getInstance()->startTime('XOOPS Boot');
@@ -46,7 +50,6 @@
*/
public static function eventCoreDatabaseNoconn($args)
{
- if (!class_exists('logger')) return;
/* @var $db XoopsDatabase */
$db = $args[0];
Logger::getInstance()->addQuery('', $db->error(), $db->errno());
@@ -54,7 +57,6 @@
public static function eventCoreDatabaseNodb($args)
{
- if (!class_exists('logger')) return;
/* @var $db XoopsDatabase */
$db = $args[0];
Logger::getInstance()->addQuery('', $db->error(), $db->errno());
@@ -114,8 +116,6 @@
public static function eventCoreIncludeCommonEnd($args)
{
- XoopsLoad::addMap(array('logger' => dirname(dirname(__FILE__)) . '/class/logger.php'));
-
$logger = Logger::getInstance();
$logger->stopTime('XOOPS Boot');
$logger->startTime('Module init');
@@ -222,3 +222,4 @@
Logger::getInstance()->addExtra($args[0], $args[1]);
}
}
+LoggerCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class MenusCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -39,3 +39,4 @@
));
}
}
+MenusCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class NotificationsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -153,3 +153,4 @@
}
}
}
+NotificationsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -24,7 +24,7 @@
class PageCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -32,3 +32,4 @@
));
}
}
+PageCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,9 +29,11 @@
class PdfCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize($args)
{
- XoopsLoad::addMap(array('pdf' => dirname(dirname(__FILE__)) . '/class/pdf.php'));
+ $path = dirname(dirname(__FILE__));
+ XoopsLoad::addMap(array('pdf' => $path . '/class/pdf.php'));
}
}
+PdfCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -31,12 +31,7 @@
*/
class ProtectorCorePreload extends XoopsPreloadItem
{
- /**
- * @static
- *
- * @param $args
- */
- public static function eventCoreIncludeCommonStart($args)
+ public static function initialize()
{
$xoops = Xoops::getInstance();
include $xoops->path('modules/protector/include/precheck.inc.php');
@@ -78,3 +73,4 @@
}
}
}
+ProtectorCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -28,7 +28,7 @@
*/
class PublisherCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -41,3 +41,4 @@
));
}
}
+PublisherCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,9 +29,10 @@
class QrcodeCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
XoopsLoad::addMap(array('xoops_qrcode' => dirname(dirname(__FILE__)) . '/class/xoops_qrcode.php'));
}
}
+QrcodeCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class SearchCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -35,3 +35,4 @@
));
}
}
+SearchCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,11 +29,12 @@
*/
class SmiliesCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
'smilies' => $path . '/class/helper.php',
+ 'smiliessmiley' => $path . '/class/smiley.php',
));
}
@@ -78,3 +79,4 @@
return true;
}
}
+SmiliesCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -74,7 +74,10 @@
if (round($module->getInfo('version'), 2) != $extension->getVar('version')) {
$module->setInfo('warning_update', true);
}
- $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getInfo('mid'), $xoops->user->getGroups());
+ $groups = array();
+ if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getInfo('mid'), $groups);
if ($sadmin && ($module->getVar('hasnotification') || is_array($module->getInfo('config')) || is_array($module->getInfo('comments')))) {
$module->setInfo('link_pref', XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getInfo('mid'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -103,8 +103,11 @@
if ($module->getVar('isactive')) {
$module->setInfo('options', $module->getAdminMenu());
}
-
- $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoops->user->getGroups());
+
+ $groups = array();
+ if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $groups);
if ($sadmin && ($module->getVar('hasnotification') || is_array($module->getInfo('config')) || is_array($module->getInfo('comments')))) {
$module->setInfo('link_pref', XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getVar('mid'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -22,7 +22,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoops = Xoops::getInstance();
-$groups = $xoops->user->getGroups();
+$groups = array();
+if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
$all_ok = false;
if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -57,7 +57,7 @@
$system_module = new SystemModule();
$system_extension = new SystemExtension();
- $adminmenu = null;
+ $adminmenu = array();
include dirname(__FILE__) . '/menu.php';
if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) {
$modpath = XOOPS_URL . '/admin.php';
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,10 @@
*/
$xoops = Xoops::getInstance();
-$groups = $xoops->user->getGroups();
+$groups = array();
+if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+
$all_ok = false;
if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
$sysperm_handler = $xoops->getHandlerGroupperm();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class UserconfigsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -46,3 +46,4 @@
}
}
}
+UserconfigsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,10 +27,8 @@
*/
class XlanguageCorePreload extends XoopsPreloadItem
{
- /**
- * @param array $args
- */
- public static function eventCoreIncludeCommonEnd($args)
+
+ public static function initialize()
{
if (XoopsLoad::fileExists($hnd_file = dirname(dirname(__FILE__)) . '/api.php')) {
include_once $hnd_file;
@@ -46,3 +44,4 @@
xlanguage_select_show(explode('|', $xoops->registry()->get('XLANGUAGE_THEME_OPTIONS')));
}
}
+XlanguageCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -50,10 +50,11 @@
/**
* @param mixed $domain string: Module dirname; global language file will be loaded if $domain is set to 'global' or not specified
+ * @param string $locale Locale to be loaded, current language content will be loaded if not specified
*
* @return boolean
*/
- public static function loadLocale($domain = 'xoops')
+ public static function loadLocale($domain = 'xoops', $locale = null)
{
$xoops = Xoops::getInstance();
// expanded domain to multiple categories, e.g. module:system, framework:filter, etc.
@@ -62,7 +63,10 @@
} else {
$path = (is_array($domain)) ? array_shift($domain) : "modules/{$domain}";
}
- $locales = self::getUserLocales();
+ if (!isset($locale))
+ $locales = self::getUserLocales();
+ else
+ $locales = array($locale);
foreach ($locales as $locale) {
$fullPath = $xoops->path("{$path}/locale/{$locale}/locale.php");
$fullPath2 = $xoops->path("{$path}/locale/{$locale}/{$locale}.php");
|
|
From: <al...@us...> - 2013-10-07 19:05:03
|
Revision: 12158
http://sourceforge.net/p/xoops/svn/12158
Author: alain91
Date: 2013-10-07 19:04:54 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
save working version
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_logger.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_page.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_system.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_1.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_14.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_logger_plugin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_configs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_modules_active.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.image.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.recaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.text.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_1c1562
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_446afb
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_7914ad
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_c28e53
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,81 @@
+<?php
+/*
+ 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.
+*/
+
+/**
+ * XOOPS main configuration file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @version $Id$
+ */
+
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
+ define("XOOPS_MAINFILE_INCLUDED", 1);
+
+ // XOOPS Physical Paths
+
+ // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
+ define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs");
+
+ // For forward compatibility
+ // Physical path to the XOOPS library directory WITHOUT trailing slash
+ define("XOOPS_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_lib");
+ // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
+ define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_data");
+ // Alias of XOOPS_PATH, for compatibility, temporary solution
+ define("XOOPS_TRUST_PATH", XOOPS_PATH);
+
+ // URL Association for SSL and Protocol Compatibility
+ $http = 'http://';
+ if (!empty($_SERVER['HTTPS'])) {
+ $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
+ }
+ define('XOOPS_PROT', $http);
+
+ // XOOPS Virtual Path (URL)
+ // Virtual path to your main XOOPS directory WITHOUT trailing slash
+ // Example: define("XOOPS_URL", "http://url_to_xoops_directory");
+ define("XOOPS_URL", "http://localhost/xoops/htdocs");
+
+ // Shall be handled later, don't forget!
+ define("XOOPS_CHECK_PATH", 0);
+ // Protect against external scripts execution if safe mode is not enabled
+ if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
+ if (function_exists("debug_backtrace")) {
+ $xoopsScriptPath = debug_backtrace();
+ if (!count($xoopsScriptPath)) {
+ die("XOOPS path check: this file cannot be requested directly");
+ }
+ $xoopsScriptPath = $xoopsScriptPath[0]["file"];
+ } else {
+ $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] : $_SERVER["SCRIPT_FILENAME"];
+ }
+ if (DIRECTORY_SEPARATOR != "/") {
+ // IIS6 may double the \ chars
+ $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
+ }
+ if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
+ exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+ }
+ }
+
+ // Secure file
+ require XOOPS_VAR_PATH . '/data/secure.php';
+
+ define("XOOPS_GROUP_ADMIN", "1");
+ define("XOOPS_GROUP_USERS", "2");
+ define("XOOPS_GROUP_ANONYMOUS", "3");
+
+ if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
+ include XOOPS_ROOT_PATH."/include/common.php";
+ }
+
+}
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi .php5 .php4 .php3 .phps
+Options -ExecCGI -Indexes
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,6 @@
+1405812495
+return array (
+ 'banners_myip' => '127.0.0.1',
+ 'banners_pager' => 15,
+ 'banners_clientspager' => 15,
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,18 @@
+1405812370
+return array (
+ 'textarea' =>
+ array (
+ 'title' => 'Plain Text',
+ 'nohtml' => 1,
+ ),
+ 'dhtmltextarea' =>
+ array (
+ 'title' => 'DHTML Form with xCode',
+ 'nohtml' => 1,
+ ),
+ 'tinymce' =>
+ array (
+ 'title' => 'TinyMCE',
+ 'nohtml' => 0,
+ ),
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,6 @@
+1405812452
+return array (
+ 'debug_mode' => 1,
+ 'debug_level' => 2,
+ 'debug_plugin' => 'legacy',
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1405812495
+return 'O:11:"XoopsModule":10:{s:7:"modinfo";N;s:9:"adminmenu";N;s:17:"' . "\0" . 'XoopsModule' . "\0" . '_msg";a:0:{}s:4:"vars";a:13:{s:3:"mid";a:6:{s:5:"value";s:2:"14";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:4:"name";a:6:{s:5:"value";s:7:"Banners";s:8:"required";b:1;s:9:"data_type";i:1;s:9:"maxlength";i:150;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"version";a:6:{s:5:"value";s:2:"10";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"last_update";a:6:{s:5:"value";s:10:"1374255542";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:6:"weight";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"isactive";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"dirname";a:6:{s:5:"value";s:7:"banners";s:8:"required";b:1;s:9:"data_type";i:7;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"hasmain";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"hasadmin";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hassearch";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hasconfig";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"hascomments";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:15:"hasnotification";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}}s:9:"cleanVars";a:0:{}s:19:"' . "\0" . 'XoopsObject' . "\0" . '_isNew";b:0;s:21:"' . "\0" . 'XoopsObject' . "\0" . '_isDirty";b:0;s:20:"' . "\0" . 'XoopsObject' . "\0" . '_errors";a:0:{}s:21:"' . "\0" . 'XoopsObject' . "\0" . '_filters";a:0:{}s:11:"plugin_path";N;}';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Autho...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X