ConLite
/
ConLite
1
0
Fork 0
Code Issues 22 Pull-Requests Projekte 2 Releases 2 Wiki Aktivität

Merge branch 'develop' into dev_php82 

# Conflicts:
#	.idea/php.xml
#	.idea/phpunit.xml
#	README.md
#	conlite/plugins/cl-mod-rewrite
#	setup/lib/defines.php
Dieser Commit ist enthalten in:
o.pinke 2023-10-16 18:07:44 +02:00
Ursprung 3a71ed5cf1 12e58c78ef
Commit f016933445
4 geänderte Dateien mit 250 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

3
.gitmodules vendored
Datei anzeigen

@ -1,6 +1,3 @@
[submodule "conlite/plugins/cl-mod-rewrite"]
path = conlite/plugins/cl-mod-rewrite
url = https://gitport.de/ConLite/cl-mod-rewrite.git
[submodule "conlite/plugins/cl-newsletter"]
path = conlite/plugins/cl-newsletter
url = https://gitport.de/ConLite/cl-newsletter.git

12
.idea/dataSources.xml Normale Datei
Datei anzeigen

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="dev_clphp74@localhost" uuid="e4a121a5-564c-40f5-b527-e0a343539f90">
<driver-ref>mariadb</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mariadb://localhost:3306/dev_clphp74</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

236
.idea/workspace.xml Normale Datei
Datei anzeigen

@ -0,0 +1,236 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="8eedb38c-41ce-4f3c-a016-df6a207a4233" name="Changes" comment="gitadmin" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerConfigs">
<option name="configs">
<option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/composer.json" />
<option value="$PROJECT_DIR$/conlite/external/rector/rector/composer.json" />
<option value="$PROJECT_DIR$/conlite/external/phpstan/phpstan/composer.json" />
<option value="$PROJECT_DIR$/conlite/external/symfony/options-resolver/composer.json" />
<option value="$PROJECT_DIR$/cms/securimage/composer.json" />
</option>
</component>
<component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
<execution>
<executable path="composer" />
</execution>
</component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="dev_php82" />
<entry key="$PROJECT_DIR$/cms/secureimage" value="master" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="ROOT_SYNC" value="DONT_SYNC" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="/usr/bin/php">
<include_path>
<path value="$PROJECT_DIR$/conlite/vendor/phpmailer/phpmailer" />
<path value="$PROJECT_DIR$/conlite/vendor/composer" />
<path value="$PROJECT_DIR$/conlite/vendor/rector/rector" />
<path value="$PROJECT_DIR$/conlite/vendor/phpstan/phpstan" />
</include_path>
</component>
<component name="ProjectId" id="2OsnK7aTqPj8IgMHzGyLAOICLU1" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;last_opened_file_path&quot;: &quot;/var/www/html/clphp8/cms/data/modules/cl_contactform/php&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/cms/data/modules/cl_contactform/php" />
</key>
</component>
<component name="RunManager" selected="Rector.cl_contactform_output.php">
<configuration name="cl_contactform_output.php" type="RectorRunConfigurationType" factoryName="RectorRunConfigurationType" temporary="true" nameIsGenerated="true">
<option name="pathsToProcess">
<list>
<option value="$PROJECT_DIR$/cms/data/modules/cl_contactform/php/cl_contactform_output.php" />
</list>
</option>
<option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
<option name="pathsToProcess">
<list>
<option value="$PROJECT_DIR$/cms/data/modules/cl_contactform/php/cl_contactform_output.php" />
</list>
</option>
<option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
<method v="2" />
</configuration>
<configuration name="xtcdynspryform0.9.2" type="RectorRunConfigurationType" factoryName="RectorRunConfigurationType" temporary="true" nameIsGenerated="true">
<option name="pathsToProcess">
<list>
<option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2" />
</list>
</option>
<option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
<option name="pathsToProcess">
<list>
<option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2" />
</list>
</option>
<option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
<method v="2" />
</configuration>
<configuration name="xtcdynspryform0.9.2_input.php" type="RectorRunConfigurationType" factoryName="RectorRunConfigurationType" temporary="true" nameIsGenerated="true">
<option name="pathsToProcess">
<list>
<option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2/php/xtcdynspryform0.9.2_input.php" />
</list>
</option>
<option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
<option name="pathsToProcess">
<list>
<option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2/php/xtcdynspryform0.9.2_input.php" />
</list>
</option>
<option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
<method v="2" />
</configuration>
<recent_temporary>
<list>
<item itemvalue="Rector.cl_contactform_output.php" />
<item itemvalue="Rector.xtcdynspryform0.9.2_input.php" />
<item itemvalue="Rector.xtcdynspryform0.9.2" />
</list>
</recent_temporary>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8eedb38c-41ce-4f3c-a016-df6a207a4233" name="Changes" comment="" />
<created>1682358089636</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1682358089636</updated>
<workItem from="1682358110742" duration="8528000" />
<workItem from="1682512199591" duration="40000" />
<workItem from="1682512266209" duration="329000" />
<workItem from="1682512610923" duration="100000" />
<workItem from="1682512717674" duration="523000" />
</task>
<task id="LOCAL-00001" summary="move composer vendor folder">
<created>1682442332378</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1682442332378</updated>
</task>
<task id="LOCAL-00002" summary="add rector.php">
<created>1682442467699</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1682442467700</updated>
</task>
<task id="LOCAL-00003" summary="gitadmin">
<created>1682442642783</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1682442642783</updated>
</task>
<task id="LOCAL-00004" summary="updates for php8">
<created>1682445298959</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1682445298959</updated>
</task>
<task id="LOCAL-00005" summary="documentation and cleaning code">
<created>1682445879204</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1682445879204</updated>
</task>
<task id="LOCAL-00006" summary="add module package xml">
<created>1682446236100</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1682446236100</updated>
</task>
<task id="LOCAL-00007" summary="updated doc-blocks and module package">
<created>1682446918410</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1682446918410</updated>
</task>
<task id="LOCAL-00008" summary="gitadmin">
<created>1682450834252</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1682450834252</updated>
</task>
<task id="LOCAL-00009" summary="gitadmin">
<created>1682513087275</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1682513087275</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="move composer vendor folder" />
<MESSAGE value="add rector.php" />
<MESSAGE value="updates for php8" />
<MESSAGE value="documentation and cleaning code" />
<MESSAGE value="add module package xml" />
<MESSAGE value="updated doc-blocks and module package" />
<MESSAGE value="gitadmin" />
<option name="LAST_COMMIT_MESSAGE" value="gitadmin" />
</component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
</component>
</project>

5
conlite/classes/template/class.template.php
Datei anzeigen

@ -184,7 +184,6 @@ class Template {
global $cCurrentModule;
$cfg = cRegistry::getConfig();
$aCfgClient = cRegistry::getClientConfig(cRegistry::getClientId());
$bModTplUsed = FALSE;
if (isset($cCurrentModule) && $cfg['dceModEdit']['use']) {
@ -201,8 +200,8 @@ class Template {
}
}
if (is_file("templates/" . $template) && !$bModTplUsed) {
$template = "templates/" . $template;
if (is_file(cRegistry::getFrontendPath() . "templates/" . $template) && !$bModTplUsed) {
$template = cRegistry::getFrontendPath() . "templates/" . $template;
}
//check if the template is a file or a string