| ' + _.htmlData(file.name) + ' | ' + - '' + file.date + ' | ' + - '' + browser.humanSize(file.size) + ' | ' + - '
| ' + $(folder).html() + " |
| t |
UliCMS 2019.1 ist das erste UliCMS Release im Jahr 2019.
Dieses
- Release legt den Hauptfokus auf Community Features, Antispam Features
- und auf Verbesserungen der Usability.
UliCMS enthält seit diesem Release eine Kommentarfunktion. Diese - ist in den Standardeinstellungen deaktiviert und kann in den den - Community-Einstellungen aktiviert werden.
-Die Kommentarfunktion wird bisher nur vom Theme impro17 - unterstützt. Sie lässt sich jedoch einfach durch den Aufruf einer - Funktion in andere Themes integrieren.
-Die Kommentarfunktion unterstützt alle Features zur Verhinderung - von Spam. Als Spam erkannte Kommentare werden als Spam markiert, aber - trotzdem gespeichert. In einem zukünftigen UliCMS Release wird das - Feature implementiert werden, dass der Spamfilter die vorherigen - Spam-Kommentare miteinbezieht, um Spam Kommentare besser erkennen zu - können.
-Details zur Nutzung der neuen Kommentarfunktion erhalten Sie im - Dokument "Neue Features in UliCMS 2019.1.pdf".
- -Es wurden zwei neue Optionen zur Bekämpfung von Formularspam hinzugefügt.
-Die Option "MX DNS-Eintrag von E-Mail Adressen überprüfen" führt eine Überprüfung der E-Mail Domain der angegebenen E-Mail Adresse durch.
-Wenn unter der Domain kein E-Mail Server vorhanden ist, handelt es sich mit hoher Wahrscheinlichkeit um eine ungültige E-Mail Adresse.
-Die Option "Anfragen von Bots blockieren" überprüft den Useragent des Clients, ob sich dieser als Bot oder Crawler ausgibt und blockiert, falls es sich um einen Bot handelt, die Nachricht.
- -Einem User können nun zusätzlich zur primären Gruppe beliebig viele sekundäre Gruppen zugewiesen. Die Berechtigungen aller Gruppen werden zusammengefügt, so dass der User eine Berechtigung hat, sobald mindestens eine Gruppe der er zugewiesen ist, diese Berechtigung gesetzt hat.
- - diff --git a/doc/ulicms-2019.1-announcement.html b/doc/ulicms-2019.1-announcement.html deleted file mode 100644 index 08596a2130..0000000000 --- a/doc/ulicms-2019.1-announcement.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - -UliCMS 2019.1 is the first UliCMS release in 2019.
This release
- focuses on community features, antispam features and usability
- improvements.
Starting with this release UliCMS features an integrated and full featured comments solution. The comments feature is disabled by default but can be easily enabled. The only official Theme which currently supports comments is "impro17". However it's very easy to integrate the comments form into other themes.
-The comments feature supports all options to prevent spam submissions of beeing released and an easy to use backend for managing comments.
- -There are new options to fight online spam in this release.
-The option "Check DNS MX Entry of email addresses" checks the mx dns entry of the domain of an E-Mail address. This ensures that the E-Mail domain really exists. However this method can not determine if an user exists on the given mail server.
-The option "Reject Requests From Bots" checks if the client identifies itself as a bot or crawler by checking it's user agent. Messages sent by crawlers will get rejected.
- -In addition to the primary group it's now possible to assign multiple secondary groups to a user. The permission arrays will be merged. If any of the group assigned to a user has a permission checked then the user owns that permissions.
- - \ No newline at end of file diff --git a/doc/ulicms-2019.2-ankuendigung.html b/doc/ulicms-2019.2-ankuendigung.html new file mode 100644 index 0000000000..cc3af63bc3 --- /dev/null +++ b/doc/ulicms-2019.2-ankuendigung.html @@ -0,0 +1,86 @@ + + + + ++ Das 2019 Quartal 2 Release von UliCMS legt den Fokus vor allem auf Usability + und Sicherheit. Für Entwickler ist zusätzlich der neue SCSS Compiler + interessant. +
++ Alle Buttons im Backend sind nun mit Icons versehen. Zu Unterseiten im + Backend wurden Menüs hinzugefügt. z.B. auf allen Unterseiten von "Inhalte" + und "Medien". +
+Benutzer & Gruppen wurden unter einen Obermenüpunkt zusammengefasst.
++ Die "Pakete" Seite im Backend wurde komplett neu gestaltet. Die + neugestaltete Paketverwaltung enthält die selben Features wie das alte + User Interface. Zusätzlich ist es nun möglich Module im Backend zu + aktivieren und zu deaktivieren. Dies war vorher nur mit dem Modul + cleanup oder direkt in + der Datenbank möglich. Es ist in diesem Release möglich, auf die alte + Ansicht der "Pakete" Seite zu wechseln. Die alte Ansicht wird in einem + zukünftigen Release entfernt werden. +
++ Die Option "Logo ausblenden" wurde auf die "Logo" Einstellungsseite + verschoben. Zuvor befand sich diese Option in den Grundeinstellungen. +
++ Wenn der Benutzer nicht über die notwendige Berechtigug um auf die + Einstellungen eines Moduls zuzugreifen, ist nun der Button nicht mehr + klickbar und ein Schloß Icon wird angezeigt. +
++ Die Optionen "XSS-Schutz" und "Erlauben diese Webseite in andere Sites + einzubinden" zur Steuerung von sicherheitsrelevanten HTTP-Headern wurden + hinzugefügt. +
++ Die Option "RTL-Sprachen verbieten" wurde zu den Spamfilter-Einstellungen + hinzugefügt. Wenn diese Option aktiviert ist, werde Nachrichten und + Kommentare welche Buchstaben in Right-To-Left Sprachen (z.B. arabisch) enthalten + abgelehnt. +
++ Ein SCSS Compiler wurde + hinzugefügt. Die StyleSheet Queue unterstützt nun *.scss Dateien. +
++ Das Feld "Benutzerdefinierte Daten (JSON)" wendet nun den CodeMirror + Code-Editor an. +
++
Es werden nun mehrere Konfigurationsumgebungen (Konfigurationsdateien) + unterstützt. Die Konfigurationsumgebung kann über die Umgebungsvariable + ULICMS_ENVIRONMENT festgelegt werden. +
+Formulare und Banner können nun aktiviert und deaktiviert werden.
+Die Anzeige eines Werbebanners kann nun zeitlich beschränkt werden.
+ + diff --git a/doc/ulicms-2019.2-announcement.html b/doc/ulicms-2019.2-announcement.html new file mode 100644 index 0000000000..a7e9229465 --- /dev/null +++ b/doc/ulicms-2019.2-announcement.html @@ -0,0 +1,85 @@ + + + + ++ The second quarter of 2019 UliCMS release focuses on usability and + security improvements. An additional new value for developers is the new + *.scss compiler which is fully integrated into the stylesheet queue API. +
++ Backend buttons nove have icons. Menus were added to backend pages with + subpages (e.g. on all subpages of "Contents". +
+Users and groups were grouped under one menu item.
++ The "packages" backend page got a full redesign. The redesigned UI has all + features of the previous UI. + Additionally there is a button to enable and disable modules. + You can switch between the old packages view and the new one. + However the old view will be removed in a future version of UliCMS. +
++ The option "hide logo" is now located at the "Logo" settings page. In + previous releases that option was located at the "General Settings" page. +
++ If a user is not permitted to use the user interface of a module, the + button is now disabled and a lock icon is shown right to the button with + the menu name. +
+ ++ The options "XSS Protection" and "Allow embedding this website in other sites" + were added to control the use of security related HTTP headers. +
++ The option "Disallow RTL-Languages" were added to the anti-spam settings. + If this option is enabled comments which are containing arabic, persian or + hebrew chars are rejected. +
+ ++ A SCSS compiler was added to + the core. The stylesheet queue now supports *.scss files. +
++ The textarea "Custom Data (JSON)" now uses the CodeMirror code editor. +
++ UliCMS now supports multiple configuration environments. The configuration + environment can be switched by setting the ULICMS_ENVIRONMENT environment + var. The default value for ULICMS_ENVIRONMENT is "default". +
+You can now enable and disable forms and advertisement banners.
++ The period in which an advertisement banner is displayed can now be + limited. +
+ + diff --git a/mk-full-package.py b/mk-full-package.py index 3e83c7d272..b0040de813 100755 --- a/mk-full-package.py +++ b/mk-full-package.py @@ -34,7 +34,8 @@ def main(): "Releases", "cms-config.php", "services", "update.php", ".gitignore", "cache", "*~", ".settings", ".project", ".buildpath", "tests", "run-tests.sh", "run-tests.bat", - "run-tests.xampp.mac.sh", ".pydevproject", "CMSConfig.php", "log") + "run-tests.xampp.mac.sh", ".pydevproject", "CMSConfig.php", "log", + "configurations", ".phpunit.result.cache") IGNORE_PATTERNS = shutil.ignore_patterns(*ignore) if args.delete and os.path.exists(target): @@ -68,6 +69,14 @@ def main(): # Composer packages zu Deploy hinzufügen os.system("php ulicms/composer install --working-dir=" + main_dir + "/ --no-dev") + old_cwd = os.getcwd() + + # Install npm packages + # TODO: is there are a way to specify a working dir like used for composer (code above)? + os.chdir("ulicms") + os.system("npm install") + os.chdir(old_cwd) + archive_name = os.path.join(target, "..", os.path.basename(target) + ".zip") if args.zip: print("zipping folder...") diff --git a/mk-upgrade-package.py b/mk-upgrade-package.py index 4d207bbe88..299834c003 100755 --- a/mk-upgrade-package.py +++ b/mk-upgrade-package.py @@ -36,7 +36,8 @@ def main(): "modules", "templates", "contents.css", "config.js", "comments", "*~", ".settings", ".project", ".buildpath", "tests", "run-tests.sh", "run-tests.bat", - "run-tests.xampp.mac.sh", ".pydevproject", "CMSConfig.php", "log") + "run-tests.xampp.mac.sh", ".pydevproject", "CMSConfig.php", "log", + "configurations", ".phpunit.result.cache") IGNORE_PATTERNS = shutil.ignore_patterns(*ignore) if args.delete and os.path.exists(target): @@ -97,9 +98,17 @@ def main(): main_dir = os.path.join(target, "ulicms") - # Composer packages zu Deploy hinzufügen + # Install all non-dev composer packages os.system("php ulicms/composer install --working-dir=" + main_dir + "/ --no-dev") + old_cwd = os.getcwd() + + # Install npm packages + # TODO: is there are a way to specify a working dir like used for composer (code above)? + os.chdir("ulicms") + os.system("npm install") + os.chdir(old_cwd) + if args.zip: print("zipping folder...") zipdir(target, archive_name) diff --git a/ulicms/.htaccess b/ulicms/.htaccess index 397c325d7e..fce85f204f 100755 --- a/ulicms/.htaccess +++ b/ulicms/.htaccess @@ -1,46 +1,70 @@Simple mode that tries to handle APL as well as it can.
-It attempts to label functions/operators based upon - monadic/dyadic usage (but this is far from fully fleshed out). - This means there are meaningful classnames so hover states can - have popups etc.
- -MIME types defined: text/apl (APL code)
MIME types
-defined: application/pgp, application/pgp-encrypted, application/pgp-keys, application/pgp-signature
Language: Abstract Syntax Notation One - (ASN.1) -
-MIME types defined: text/x-ttcn-asn
The development of this mode has been sponsored by Ericsson - .
-Coded by Asmelash Tsegay Gebretsadkan
-MIME types defined: text/x-asterisk.
A mode for Brainfuck
- -MIME types defined: text/x-brainfuck
Simple mode that tries to handle C-like languages as well as it
- can. Takes two configuration parameters: keywords, an
- object whose property names are the keywords in the language,
- and useCPP, which determines whether C preprocessor
- directives are recognized.
MIME types defined: text/x-csrc
- (C), text/x-c++src (C++), text/x-java
- (Java), text/x-csharp (C#),
- text/x-objectivec (Objective-C),
- text/x-scala (Scala), text/x-vertex
- x-shader/x-fragment (shader programs),
- text/x-squirrel (Squirrel) and
- text/x-ceylon (Ceylon)
MIME types defined: text/x-clojure.
MIME types defined: text/x-cmake.
Select Theme Select Font Size - - - - -
- - -MIME types defined: application/vnd.coffeescript, text/coffeescript, text/x-coffeescript.
The CoffeeScript mode was written by Jeff Pickhardt.
- -MIME types defined: text/x-common-lisp.
MIME types defined: text/x-crystal.
A mode for Closure Stylesheets (GSS).
-MIME type defined: text/x-gss.
MIME types defined: text/css, text/x-scss (demo), text/x-less (demo).
The LESS mode is a sub-mode of the CSS mode (defined in css.js).
The SCSS mode is a sub-mode of the CSS mode (defined in css.js).
MIME types defined:
- application/x-cypher-query
-
Simple mode that handle D-Syntax (DLang Homepage).
- -MIME types defined: text/x-d
- .
MIME types defined: text/x-diff.
Mode for HTML with embedded Django template markup.
- -MIME types defined: text/x-django
Dockerfile syntax highlighting for CodeMirror. Depends on - the simplemode addon.
- -MIME types defined: text/x-dockerfile
MIME types defined: application/xml-dtd.
MIME types defined: text/x-dylan.
Created by Robert Plummer
-Based on CodeMirror's clike mode. For more information see HPCC Systems web site.
-MIME types defined: text/x-ecl.
MIME types defined: text/x-eiffel.
Created by YNH.
-MIME types defined: text/x-elm.
MIME types defined: text/x-erlang.
Simple mode that handles Factor Syntax (Factor on WikiPedia).
- -MIME types defined: text/x-factor.
MIME type: text/x-fcl
Simple mode that handle Forth-Syntax (Forth on WikiPedia).
- -MIME types defined: text/x-forth.
MIME types defined: text/x-fortran.
Handles AT&T assembler syntax (more specifically this handles
- the GNU Assembler (gas) syntax.)
- It takes a single optional configuration parameter:
- architecture, which can be one of "ARM",
- "ARMv6" or "x86".
- Including the parameter adds syntax for the registers and special
- directives for the supplied architecture.
-
-
MIME types defined: text/x-gas
Optionally depends on other modes for properly highlighted code blocks.
- -Gfm mode supports these options (apart those from base Markdown mode):
-
gitHubSpice: booleantrue).taskLists: boolean- [ ] syntax (default: true).strikethrough: boolean~~foo~~ syntax (default: true).emoji: boolean:emoji: syntax (default: true).MIME types defined: text/x-feature.
MIME type: text/x-go
MIME types defined: text/x-groovy
MIME types defined: text/x-haml.
Handlebars syntax highlighting for CodeMirror.
- -MIME types defined: text/x-handlebars-template
Supported options: base to set the mode to
- wrap. For example, use
mode: {name: "handlebars", base: "text/html"}
- to highlight an HTML template.
-MIME types
- defined: text/x-literate-haskell.
Parser configuration parameters recognized: base to
- set the base mode (defaults to "haskell").
MIME types defined: text/x-haskell.
Hxml mode:
- - -MIME types defined: text/x-haxe, text/x-hxml.
Mode for html embedded scripts like JSP and ASP.NET. Depends on multiplex and HtmlMixed which in turn depends on
- JavaScript, CSS and XML.
Other dependencies include those of the scripting language chosen.
MIME types defined: application/x-aspx (ASP.NET),
- application/x-ejs (Embedded Javascript), application/x-jsp (JavaServer Pages)
- and application/x-erb
The HTML mixed mode depends on the XML, JavaScript, and CSS modes.
- -It takes an optional mode configuration
- option, tags, which can be used to add custom
- behavior for specific tags. When given, it should be an object
- mapping tag names (for example script) to arrays or
- three-element arrays. Those inner arrays indicate [attributeName,
- valueRegexp, modeSpec]
- specifications. For example, you could use ["type", /^foo$/,
- "foo"] to map the attribute type="foo" to
- the foo mode. When the first two fields are null
- ([null, null, "mode"]), the given mode is used for
- any such tag that doesn't match any of the previously given
- attributes. For example:
var myModeSpec = {
- name: "htmlmixed",
- tags: {
- style: [["type", /^text\/(x-)?scss$/, "text/x-scss"],
- [null, null, "css"]],
- custom: [[null, null, "customMode"]]
- }
-}
-
- MIME types defined: text/html
- (redefined, only takes effect if you load this parser after the
- XML parser).
MIME types defined: message/http.
MIME types defined: text/x-idl.
This is a list of every mode in the distribution. Each mode lives
-in a subdirectory of the mode/ directory, and typically
-defines a single JavaScript file that implements the mode. Loading
-such file will make the language available to CodeMirror, through
-the mode
-option.
- JavaScript mode supports several configuration options: -
json which will set the mode to expect JSON
- data rather than a JavaScript program.jsonld which will set the mode to expect
- JSON-LD linked data rather
- than a JavaScript program (demo).typescript which will activate additional
- syntax highlighting and some other things for TypeScript code
- (demo).statementIndent which (given a number) will
- determine the amount of indentation to use for statements
- continued on a new line.wordCharacters, a regexp that indicates which
- characters should be considered part of an identifier.
- Defaults to /[\w$]/, which does not handle
- non-ASCII identifiers. Can be set to something more elaborate
- to improve Unicode support.MIME types defined: text/javascript, application/json, application/ld+json, text/typescript, application/typescript.
This is a specialization of the JavaScript mode.
-This is a specialization of the JavaScript mode.
-JSX Mode for React's -JavaScript syntax extension.
- -MIME types defined: text/jsx, text/typescript-jsx.
${] [number 10] [string-2 }`]")
-
- MT("line_comment",
- "([bracket&tag <][tag foo] [comment // hello]",
- " [bracket&tag >][operator ++])")
-
- MT("line_comment_not_in_tag",
- "([bracket&tag <][tag foo][bracket&tag >] // hello",
- " [bracket&tag ][operator ++])")
-
- MT("block_comment",
- "([bracket&tag <][tag foo] [comment /* hello]",
- "[comment line 2]",
- "[comment line 3 */] [bracket&tag >][operator ++])")
-
- MT("block_comment_not_in_tag",
- "([bracket&tag <][tag foo][bracket&tag >]/* hello",
- " line 2",
- " line 3 */ [bracket&tag ][operator ++])")
-
- MT("missing_attr",
- "([bracket&tag <][tag foo] [attribute selected][bracket&tag />][operator ++])")
-
- MT("indent_js",
- "([bracket&tag <][tag foo][bracket&tag >]",
- " [bracket&tag <][tag bar] [attribute baz]={[keyword function]() {",
- " [keyword return] [number 10]",
- " }}[bracket&tag />]",
- " [bracket&tag ])")
-
- MT("spread",
- "([bracket&tag <][tag foo] [attribute bar]={[meta ...][variable baz] [operator /][number 2]}[bracket&tag />])")
-
- MT("tag_attribute",
- "([bracket&tag <][tag foo] [attribute bar]=[bracket&tag <][tag foo][bracket&tag />/>][operator ++])")
-
- var ts_mode = CodeMirror.getMode({indentUnit: 2}, "text/typescript-jsx")
- function TS(name) { test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1)) }
-
- TS("tsx_react_integration",
- "[keyword interface] [def Props] {",
- " [property foo]: [type string];",
- "}",
- "[keyword class] [def MyComponent] [keyword extends] [type React].[type Component] [operator <] [type Props], [type any] [operator >] {",
- " [property render]() {",
- " [keyword return] [bracket&tag <][tag span][bracket&tag >]{[keyword this].[property props].[property foo]}[bracket&tag ]",
- " }",
- "}",
- "[bracket&tag <][tag MyComponent] [attribute foo]=[string \"bar\"] [bracket&tag />]; [comment //ok]",
- "[bracket&tag <][tag MyComponent] [attribute foo]={[number 0]} [bracket&tag />]; [comment //error]")
-
-})()
diff --git a/ulicms/admin/codemirror/mode/julia/index.html b/ulicms/admin/codemirror/mode/julia/index.html
deleted file mode 100644
index e1492c210f..0000000000
--- a/ulicms/admin/codemirror/mode/julia/index.html
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-MIME types defined: text/x-julia.
MIME types defined: text/x-livescript.
The LiveScript mode was written by Kenneth Bentley.
- -Loosely based on Franciszek
- Wawrzak's CodeMirror
- 1 mode. One configuration parameter is
- supported, specials, to which you can provide an
- array of strings to have those identifiers highlighted with
- the lua-special style.
MIME types defined: text/x-lua.
If you also want support strikethrough, emoji and few other goodies, check out Github-Flavored Markdown mode.
Optionally depends on other modes for properly highlighted code blocks, - and XML mode for properly highlighted inline XML blocks.
- -Markdown mode supports these options:
-highlightFormatting: boolean*[]()etc.) (default: false).maxBlockquoteDepth: boolean0 - infinite nesting).xml: booleantrue).fencedCodeBlockHighlighting: booleantrue).tokenTypeOverrides: Object{code: "code"}).allowAtxHeaderWithoutSpace: booleanfalse).MIME types defined: text/x-markdown.
MIME types defined: text/x-mathematica (Mathematica).
MIME types defined: application/mbox.
MIME types defined: text/mirc.
MIME types defined: text/x-ocaml (OCaml) and text/x-fsharp (F#).
Simple mode that tries to handle Modelica as well as it can.
- -MIME types defined: text/x-modelica
- (Modlica code).
- Simple mode for highlighting MscGen and two derived sequence - chart languages. -
- - - -MIME types defined:
- text/x-mscgen
- text/x-xu
- text/x-msgenny
-
MIME types defined: text/x-nginx-conf.
MIME types defined: text/x-nsis.
The N-Triples mode also works well with on - N-Quad documents. -
- - - -MIME types defined: application/n-triples.
N-Quads add a fourth - element to the statement to track which graph the statement is from. - Otherwise, it's identical to N-Triples.
- - - -MIME types defined: application/n-quads.
MIME types defined: text/x-octave.
MIME type defined: text/x-oz.
MIME types defined: text/x-pascal.
Created by Forbes Lindesay.
-MIME types defined: text/x-perl.
Simple HTML/PHP mode based on - the C-like mode. Depends on XML, - JavaScript, CSS, HTMLMixed, and C-like modes.
- -MIME types defined: application/x-httpd-php (HTML with PHP code), text/x-php (plain, non-wrapped PHP code).
- Simple mode that handles Pig Latin language. -
- -MIME type defined: text/x-pig
- (PIG code)
-
MIME types defined: application/x-powershell.
MIME types defined: text/x-properties,
- text/x-ini.
MIME types defined: text/x-protobuf.
Created by Forbes Lindesay. Managed as part of a Brackets extension at https://github.com/ForbesLindesay/jade-brackets.
-MIME type defined: text/x-pug, text/x-jade.
MIME types defined: text/x-puppet.
Usefull for superset of python syntax like Enthought enaml, IPython magics and questionmark help
-^[\\+\\-\\*/%&|\\^~<>!]including
@on Python 3
^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))
^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))
^((//=)|(>>=)|(<<=)|(\\*\\*=))
^[_A-Za-z][_A-Za-z0-9]*on Python 2 and
^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*on Python 3.
MIME types defined: text/x-python and text/x-cython.
MIME type defined: text/x-q.
MIME types defined: text/x-rsrc.
Development of the CodeMirror R mode was kindly sponsored - by Ubalo.
- -MIME types defined: text/x-rpm-changes.
MIME types defined: text/x-rpm-spec, text/x-rpm-changes.
- The python mode will be used for highlighting blocks
- containing Python/IPython terminal sessions: blocks starting with
- >>> (for Python) or In [num]: (for
- IPython).
-
- Further, the stex mode will be used for highlighting
- blocks containing LaTex code.
-
MIME types defined: text/x-rst.
MIME types defined: text/x-ruby.
Development of the CodeMirror Ruby mode was kindly sponsored - by Ubalo.
- -MIME types defined: text/x-rustsrc.
MIME types defined: text/x-sas.
MIME types defined: text/x-sass.
MIME types defined: text/x-scheme.
MIME types defined: text/x-sh, application/x-sh.
MIME types defined: application/sieve.
MIME types defined: application/x-slim.
Simple Smalltalk mode.
- -MIME types defined: text/x-stsrc.
Mode for Smarty version 2 or 3, which allows for custom delimiter tags.
- -Several configuration parameters are supported:
- -
leftDelimiter and rightDelimiter,
- which should be strings that determine where the Smarty syntax
- starts and ends.version, which should be 2 or 3.baseMode, which can be a mode spec
- like "text/html" to set a different background mode.MIME types defined: text/x-smarty
MIME types defined: text/x-solr.
A mode for Closure Templates (Soy).
-MIME type defined: text/x-soy.
MIME types defined: application/sparql-query.
MIME types defined: text/x-spreadsheet.
Created by Robert Plummer
-MIME types defined:
- text/x-sql,
- text/x-mysql,
- text/x-mariadb,
- text/x-cassandra,
- text/x-plsql,
- text/x-mssql,
- text/x-hive,
- text/x-pgsql,
- text/x-gql,
- text/x-gpsql.
- text/x-esper.
-
MIME types defined: text/x-stex.
MIME types defined: text/x-styl.
Created by Dmitry Kiselyov
-A simple mode for Swift
- -MIME types defined: text/x-swift (Swift code)
MIME types defined: text/x-tcl.
MIME types defined: text/x-textile.
TiddlyWiki mode supports a single configuration.
- -MIME types defined: text/x-tiddlywiki.
Created by Forbes Lindesay.
-MIME type defined: text/x-toml.
Mode for HTML with embedded Tornado template markup.
- -MIME types defined: text/x-tornado
MIME types defined: troff.
Language: Testing and Test Control Notation - - Configuration files - (TTCN-CFG) -
-MIME types defined: text/x-ttcn-cfg.
The development of this mode has been sponsored by Ericsson - .
-Coded by Asmelash Tsegay Gebretsadkan
-Language: Testing and Test Control Notation - (TTCN) -
-MIME types defined: text/x-ttcn,
- text/x-ttcn3, text/x-ttcnpp.
The development of this mode has been sponsored by Ericsson - .
-Coded by Asmelash Tsegay Gebretsadkan
-MIME types defined: text/turtle.
MIME type defined: text/x-vb.
MIME types defined: text/vbscript.
MIME types defined: text/velocity.
-Syntax highlighting and indentation for the Verilog and SystemVerilog languages (IEEE 1800). -
MIME types defined: text/x-verilog and text/x-systemverilog.
-Syntax highlighting and indentation for the VHDL language. -
MIME types defined: text/x-vhdl.
MIME types defined: text/x-vue
MIME type defined: text/x-webidl.
The XML mode supports these configuration parameters:
-htmlMode (boolean)br) do not require a closing tag.matchClosing (boolean)alignCDATA (boolean)MIME types defined: application/xml, text/html.
MIME types defined: application/xquery.
Development of the CodeMirror XQuery mode was sponsored by - MarkLogic and developed by - Mike Brevoort. -
- -][variable hello] [variable world][tag
]"); - - MT("test namespaced variable", - "[keyword declare] [keyword namespace] [variable e] [keyword =] [string \"http://example.com/ANamespace\"][variable ;declare] [keyword variable] [variable $e:exampleComThisVarIsNotRecognized] [keyword as] [keyword element]([keyword *]) [variable external;]"); - - MT("test EQName variable", - "[keyword declare] [keyword variable] [variable $\"http://www.example.com/ns/my\":var] [keyword :=] [atom 12][variable ;]", - "[tagMIME types defined: text/x-yacas (yacas).
Defines a mode that parses
-a YAML frontmatter
-at the start of a file, switching to a base mode at the end of that.
-Takes a mode configuration option base to configure the
-base mode, which defaults to "gfm".
MIME types defined: text/x-yaml.
MIME types defined: text/x-z80, text/x-ez80.
| '; + } + + for (j = 0; j < 7; j += 1) { + table += ' | ' + options.i18n[globalLocale].dayOfWeekShort[(j + options.dayOfWeekStart) % 7] + ' | '; + } + + table += '
|---|---|
| ' + w + ' | '; + } + } + + table += '' +
+ ' ' + d + ' ' +
+ ' | ';
+
+ if (start.getDay() === options.dayOfWeekStartPrev) {
+ table += '
| "),t=0;t<7;t+=1)g+=" | "+C.i18n[o].dayOfWeekShort[(t+C.dayOfWeekStart)%7]+" | ";g+="
|---|---|
| "+f+" | ")),g+=''+u+" | ",p.getDay()===C.dayOfWeekStartPrev&&(g+="
| "),t=0;t<7;t+=1)g+=" | "+C.i18n[n].dayOfWeekShort[(t+C.dayOfWeekStart)%7]+" | ";g+="
|---|---|
| "+f+" | ")),g+=''+d+" | ",p.getDay()===C.dayOfWeekStartPrev&&(g+="
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
' . get_translation("passwords_not_equal") . '
'; + } } -if (! $_SESSION ["require_password_change"]) { - echo ''; +if (! $_SESSION["require_password_change"]) { + echo ''; } else { - ?> + ?>" . get_translation ( "package_name_was_removed", array ( - "%name%" => $displayName - ) ) . "
"; - } else { - echo "" . nl2br ( get_translation ( "removing_package_failed", array ( - "%name%" => $displayName - ) ) ) . "
"; - } - } - } - ?> + + $greenHex = "#04d004"; + + // TODO: truncate_installed_patches sollte in einen Controller + if (isset($_POST["truncate_installed_patches"]) and $permissionChecker->hasPermission("patch_management")) { + Database::truncateTable("installed_patches"); + } + + if (! isset($_SESSION["show_core_modules"])) { + $_SESSION["show_core_modules"] = false; + } + + if ($permissionChecker->hasPermission("remove_packages")) { + // Modul deinstallieren + if (isset($_GET["remove"]) and getModuleMeta($_GET["remove"], "source") != "core") { + $remove = basename($_GET["remove"]); + + $type = $_GET["type"]; + $uninstalled = uninstall_module($remove, $type); + + $displayName = $type == "theme" ? "theme-{$remove}" : $remove; + + if ($uninstalled) { + echo "" . get_translation("package_name_was_removed", array( + "%name%" => $displayName + )) . "
"; + } else { + echo "" . nl2br(get_translation("removing_package_failed", array( + "%name%" => $displayName + ))) . "
"; + } + } + } + ?> hasPermission ( "install_packages" )) { - ?> + if ($permissionChecker->hasPermission("install_packages")) { + ?> +@@ -71,98 +78,98 @@
0) { - echo "@@ -174,104 +181,104 @@
0) { - echo "+ + translate("installed_patches"); + ?>
+ translate("installed_patches_help"); + ?>
hasPermission ( "upload_patches" )) { - ?> + + if ($permissionChecker->hasPermission("upload_patches")) { + ?>+ +
+ ?> addToken ( $user ["id"] ); - $passwordReset->sendMail ( $token, $user ["email"], get_ip (), $user ["firstname"], $user ["lastname"] ); - $message = get_translation ( "PASSWORD_RESET_SUCCESSFULL" ); - } else { - $message = get_translation ( "NO_SUCH_USER" ); - } - } - ?> + $messame = null; + if (isset($_POST["username"]) and ! empty($_POST["username"])) { + $username = $_POST["username"]; + $user = getUserByName($username); + if ($user) { + $passwordReset = new PasswordReset(); + $token = $passwordReset->addToken($user["id"]); + $passwordReset->sendMail($token, $user["email"], get_ip(), $user["firstname"], $user["lastname"]); + $message = get_translation("PASSWORD_RESET_SUCCESSFULL"); + } else { + $message = get_translation("NO_SUCH_USER"); + } + } + ?>
"
- alt=""> ">
- 
">
- | '; + } + + for (j = 0; j < 7; j += 1) { + table += ' | ' + options.i18n[globalLocale].dayOfWeekShort[(j + options.dayOfWeekStart) % 7] + ' | '; + } + + table += '
|---|---|
| ' + w + ' | '; + } + } + + table += '' +
+ ' ' + d + ' ' +
+ ' | ';
+
+ if (start.getDay() === options.dayOfWeekStartPrev) {
+ table += '
| "),t=0;t<7;t+=1)g+=" | "+C.i18n[o].dayOfWeekShort[(t+C.dayOfWeekStart)%7]+" | ";g+="
|---|---|
| "+f+" | ")),g+=''+u+" | ",p.getDay()===C.dayOfWeekStartPrev&&(g+="
| "),t=0;t<7;t+=1)g+=" | "+C.i18n[n].dayOfWeekShort[(t+C.dayOfWeekStart)%7]+" | ";g+="
|---|---|
| "+f+" | ")),g+=''+d+" | ",p.getDay()===C.dayOfWeekStartPrev&&(g+="
- +
getText()));?> echo Input::SingleSelect("action", "", $actionSelect, 1); ?>" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
- + "off" + )); + ?> echo htmlspecialchars($row->html); ?> +
+
+
+
+
+
+
- +
diff --git a/ulicms/content/modules/core_forms/templates/list.php b/ulicms/content/modules/core_forms/templates/list.php index f988f148c4..ebe64cb2fe 100644 --- a/ulicms/content/modules/core_forms/templates/list.php +++ b/ulicms/content/modules/core_forms/templates/list.php @@ -5,14 +5,13 @@ } else { $forms = Forms::getAllForms(); ?> -- " - class="btn btn-default btn-back"> -
+ + hasPermission ( "forms_create" )){ ?> diff --git a/ulicms/content/modules/core_forms/templates/new.php b/ulicms/content/modules/core_forms/templates/new.php index 4f98f6b63c..2e1564869d 100644 --- a/ulicms/content/modules/core_forms/templates/new.php +++ b/ulicms/content/modules/core_forms/templates/new.php @@ -7,7 +7,7 @@ $pages = getAllPages(); ?>" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
@@ -15,6 +15,13 @@ class="btn btn-default btn-back"> *
+
+
*
- +
&ref=home" - class="btn btn-default"> - + class="btn btn-default">
@@ -93,12 +92,16 @@
UliCMS Portal
+ role="button"> UliCMS
+ Portal
-
+
+
Feedback
+ class="btn btn-info" role="button">
+ Feedback
diff --git a/ulicms/content/modules/core_info/templates/license.php b/ulicms/content/modules/core_info/templates/license.php
index 7646f26ad9..dc252f26a5 100755
--- a/ulicms/content/modules/core_info/templates/license.php
+++ b/ulicms/content/modules/core_info/templates/license.php
@@ -1,7 +1,7 @@
"
class="btn btn-info" role="button">
Redistribution and use in source and binary forms, with or without diff --git a/ulicms/content/modules/core_media/metadata.json b/ulicms/content/modules/core_media/metadata.json index ddba99c597..5ea286557e 100755 --- a/ulicms/content/modules/core_media/metadata.json +++ b/ulicms/content/modules/core_media/metadata.json @@ -1,6 +1,6 @@ { "source": "core", - "version": "2018.3", + "version": "2019.2", "embed": false, "actions": { "media": "templates/media.php", diff --git a/ulicms/content/modules/core_media/templates/audio/edit.php b/ulicms/content/modules/core_media/templates/audio/edit.php index 308a790869..2624ecdcdf 100644 --- a/ulicms/content/modules/core_media/templates/audio/edit.php +++ b/ulicms/content/modules/core_media/templates/audio/edit.php @@ -1,13 +1,13 @@ hasPermission ( "audio" ) and $permissionChecker->hasPermission ( "audio_edit" )) { - $id = intval ( $_REQUEST ["id"] ); - $query = db_query ( "SELECT * FROM " . tbname ( "audio" ) . " WHERE id = $id" ); - if (db_num_rows ( $query ) > 0) { - $result = db_fetch_object ( $query ); - ?>
+$permissionChecker = new ACL(); +if ($permissionChecker->hasPermission("audio") and $permissionChecker->hasPermission("audio_edit")) { + $id = intval($_REQUEST["id"]); + $query = db_query("SELECT * FROM " . tbname("audio") . " WHERE id = $id"); + if (db_num_rows($query) > 0) { + $result = db_fetch_object($query); + ?>
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
0) { - $sql .= " where category_id = " . $_SESSION ["filter_category"] . " "; +$sql = "SELECT id, name, mp3_file, ogg_file FROM " . tbname("audio") . " "; +if ($_SESSION["filter_category"] > 0) { + $sql .= " where category_id = " . $_SESSION["filter_category"] . " "; } $sql .= " ORDER by id"; -$all_audio = db_query ( $sql ); +$all_audio = db_query($sql); + +if ($permissionChecker->hasPermission("audio")) { + ?> + -if ($permissionChecker->hasPermission ( "audio" )) { - ?> -- " - class="btn btn-default btn-back"> -
id;
+ ?>">"
+
+ translate("edit");
+ ?>"
title=""> - " - class="btn btn-default btn-back"> -
++$permissionChecker = new ACL(); +if ($permissionChecker->hasPermission("videos") and $permissionChecker->hasPermission("videos_edit")) { + $id = intval($_REQUEST["id"]); + $query = db_query("SELECT * FROM " . tbname("videos") . " WHERE id = $id"); + if (db_num_rows($query) > 0) { + $result = db_fetch_object($query); + ?>
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
0) { - $sql .= " where category_id = " . $_SESSION ["filter_category"] . " "; +$sql = "SELECT id, name, mp4_file, webm_file, ogg_file FROM " . tbname("videos") . " "; +if ($_SESSION["filter_category"] > 0) { + $sql .= " where category_id = " . $_SESSION["filter_category"] . " "; } $sql .= " ORDER by id"; -$all_videos = db_query ( $sql ); +$all_videos = db_query($sql); + +if ($permissionChecker->hasPermission("videos")) { + ?> + -if ($permissionChecker->hasPermission ( "videos" )) { - ?> -- " - class="btn btn-default btn-back"> -
| + + translate("id"); + ?> | + + translate("name"); + ?> | hasPermission("videos_edit")){?>@@ -85,79 +84,79 @@ class="btn btn-default btn-back"> | |
|---|---|---|---|
| id; - ?> + + echo $row->id; + ?> | name ); - ?> + + echo htmlspecialchars($row->name); + ?> | hasPermission("videos_edit")){?>id;
+ ?>">"
+
+ translate("edit");
+ ?>"
title=""> |
+
+ translate("edit");
+ ?>">
+$permissionChecker = new ACL(); +if ($permissionChecker->hasPermission("videos") and $permissionChecker->hasPermission("videos_create")) { + ?>
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back"> +
name = $name; + $model->version = getModuleMeta ( $name, "version" ); + $model->manufacturerName = getModuleMeta ( $name, "manufacturer_name" ); + $model->manufacturerUrl = getModuleMeta ( $name, "manufacturer_url" ); + $model->source = getModuleMeta ( $name, "source" ); + $model->customPermissions = is_array ( getModuleMeta ( $name, "custom_acl" ) ) ? getModuleMeta ( $name, "custom_acl" ) : array (); + $model->adminPermission = getModuleMeta ( $name, "admin_permission" ); + natcasesort ( $model->customPermissions ); + ViewBag::set ( "model", $model ); + $html = Template::executeModuleTemplate ( self::MODULE_NAME, "packages/info/module.php" ); + HTMLResult ( $html ); + } + public function getThemeInfo() { + $name = stringOrNull ( Request::getVar ( "name", null, "str" ) ); + if (! $name) { + return TextResult ( get_translation ( "not_found" ) ); + } + $model = new ThemeInfoViewModel (); + $model->name = $name; + $model->version = getThemeMeta ( $name, "version" ); + $model->manufacturerName = getThemeMeta ( $name, "manufacturer_name" ); + $model->manufacturerUrl = getThemeMeta ( $name, "manufacturer_url" ); + $model->source = getThemeMeta ( $name, "source" ); + $model->disableFunctions = is_array ( getThemeMeta ( $name, "disable_functions" ) ) ? getThemeMeta ( $name, "disable_functions" ) : array (); + natcasesort ( $model->disableFunctions ); + ViewBag::set ( "model", $model ); + $html = Template::executeModuleTemplate ( self::MODULE_NAME, "packages/info/theme.php" ); + HTMLResult ( $html ); + } + public function switchView() { + $_SESSION ["package_view"] = $_SESSION ["package_view"] == "packages" ? "modules" : "packages"; + $this->redirectToPackageView (); + } + public function redirectToPackageView() { + Response::redirect ( ModuleHelper::buildActionURL ( $_SESSION ["package_view"] ) ); + } + public function uninstallModule() { + $name = Request::getVar ( "name" ); + $type = "module"; + $pkg = new PackageManager (); + if (uninstall_module ( $name, $type )) { + $this->redirectToPackageView (); + } else { + $errorMessage = get_translation ( "removing_package_failed", array ( + "%name%" => $name + ) ); + ExceptionResult ( $errorMessage, HttpStatusCode::INTERNAL_SERVER_ERROR ); + } + } + public function uninstallTheme() { + $name = Request::getVar ( "name" ); + $type = "theme"; + $pkg = new PackageManager (); + if (uninstall_module ( $name, $type )) { + $this->redirectToPackageView (); + } else { + $errorMessage = get_translation ( "removing_package_failed", array ( + "%name%" => $name + ) ); + ExceptionResult ( $errorMessage, HttpStatusCode::INTERNAL_SERVER_ERROR ); + } + } + public function toggleModule() { + $name = Request::getVar ( "name" ); + + $module = new Module ( $name ); + $oldState = $module->isEnabled (); + $newState = false; + if ($oldState) { + $module->disable (); + $newState = false; + } else { + $module->enable (); + $newState = true; + } + $module->save (); + JSONResult ( array ( + "name" => $name, + "enabled" => $newState + ) ); + } + public function truncatedInstalledPatches() { + Database::truncateTable ( "installed_patches" ); + TextResult ( "ok", HttpStatusCode::OK ); + } +} diff --git a/ulicms/content/modules/core_package_manager/js/list.js b/ulicms/content/modules/core_package_manager/js/list.js new file mode 100644 index 0000000000..9ed60b7c19 --- /dev/null +++ b/ulicms/content/modules/core_package_manager/js/list.js @@ -0,0 +1,114 @@ +$(function() { + bootbox.setDefaults({ + 'locale' : $("html").data("select2-language") + }); + + $(document).ajaxSend(function() { + setWaitCursor(); + }); + $(document).ajaxComplete(function() { + setDefaultCursor(); + }); + + // attach handler to form's submit event + $('.uninstall-form').submit(function(event) { + message = $(event.target).data("confirm-message"); + + event.preventDefault(); + + bootbox.confirm(message, function(result) { + if (result) { + var form = $(event.target); + // submit the form + $(form).ajaxSubmit({ + success : function(result) { + // hide and remove the table row of the uninstalled + // package + $(form).closest("tr").fadeOut(400, function() { + $(form).closest("tr").remove(); + }); + }, + error : function(xhr, status, error) { + bootbox.alert(error); + } + }); + } + }); + }); + $('#truncate-installed-patches').submit(function(event) { + message = $(event.target).data("confirm-message"); + + event.preventDefault(); + + bootbox.confirm(message, function(result) { + if (result) { + var form = $(event.target); + // submit the form + $(form).ajaxSubmit({ + success : function(result) { + $("#patch-list tbody tr").remove(); + }, + error : function(xhr, status, error) { + bootbox.alert(error); + } + }); + } + }); + }); + $(".toggle-module-form") + .submit( + function(event) { + + event.preventDefault(); + + var form = $(event.target); + // submit the form + $(form) + .ajaxSubmit( + { + success : function(result) { + // hide and remove the table row + // of the + // uninstalled + // package + console.log("[data-btn-for=" + + result["name"] + "]"); + var settingsButton = $( + "[data-btn-for=" + + result["name"] + + "]").not( + ".has-no-settings"); + if (result["enabled"]) { + $(form).find(".btn-enable") + .hide(); + $(form) + .find( + ".btn-disable") + .show(); + $(settingsButton).attr( + "disabled", null); + $(settingsButton) + .removeClass( + "disabled"); + } else { + $(form).find(".btn-enable") + .show(); + $(form) + .find( + ".btn-disable") + .hide(); + $(settingsButton).attr( + "disabled", + "disabled"); + + $(settingsButton).addClass( + "disabled"); + } + + }, + error : function(xhr, status, error) { + bootbox.alert(error); + } + }); + }); +}); diff --git a/ulicms/content/modules/core_package_manager/lang/de.php b/ulicms/content/modules/core_package_manager/lang/de.php index b41f75bc58..6528c091ae 100644 --- a/ulicms/content/modules/core_package_manager/lang/de.php +++ b/ulicms/content/modules/core_package_manager/lang/de.php @@ -1,2 +1,21 @@ hasPermission("update_system") and ! $runningInGoogleCloud) { $patches = file_get_contents_wrapper(PATCH_CHECK_URL, true); ?> +" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
+ + " . get_translation("no_patches_available") . ""; @@ -35,10 +38,10 @@ class="btn btn-default btn-back"> } } ?> - + + class="btn btn-info"> hasPermission("install_packages")) { - noPerms(); +$permissionChecker = new ACL (); +if (! $permissionChecker->hasPermission ( "install_packages" )) { + noPerms (); } else { - ?> + ?>- " - class="btn btn-default btn-back"> + " + class="btn btn-default btn-back"> +
-- +
UliCMS eXtend + target="_blank"> UliCMS eXtend
hasPermission("install_packages")) { - noPerms(); +$permissionChecker = new ACL (); +$pkg = new PackageManager (); +if (! $permissionChecker->hasPermission ( "install_packages" )) { + noPerms (); } else { - $pkg_src = Settings::get("pkg_src"); - @set_time_limit(0); - ?> + $pkg_src = Settings::get ( "pkg_src" ); + @set_time_limit ( 0 ); + ?>- " - class="btn btn-default btn-back"> + " + class="btn btn-default btn-back">
+ if (! $pkg_src) { + ?>
" . str_ireplace("%pkg%", $packagesToInstall[$i], get_translation("INSTALLATION_SUCCESSFULL")) . "
"; - } else { - echo "" . str_ireplace("%pkg%", $packagesToInstall[$i], get_translation("EXTRACTION_OF_PACKAGE_FAILED")) . "
"; - } - } - @unlink($tmpFile); - } - } - } - - clearCache(); - ?> + } else { + for($i = 0; $i < count ( $packagesToInstall ); $i ++) { + if (! empty ( $packagesToInstall [$i] )) { + $pkgURL = $packageArchiveFolder . basename ( $packagesToInstall [$i] ) . ".tar.gz"; + $pkgContent = @file_get_contents_wrapper ( $pkgURL ); + + // Wenn Paket nicht runtergeladen werden konnte + if (! $pkgContent or strlen ( $pkgContent ) < 1) { + echo "" . str_ireplace ( "%pkg%", $packagesToInstall [$i], get_translation ( "download_failed" ) ) . "
"; + } else { + $tmpdir = "../content/tmp/"; + if (! is_dir ( $tmpdir )) { + mkdir ( $tmpdir, 0777 ); + } + + $tmpFile = $tmpdir . $packagesToInstall [$i] . ".tar.gz"; + + // write downloaded tarball to file + $handle = fopen ( $tmpFile, "wb" ); + fwrite ( $handle, $pkgContent ); + fclose ( $handle ); + + if (is_file ( $tmpFile )) { + // Paket installieren + if ($pkg->installPackage ( $tmpFile, false )) { + echo "" . str_ireplace ( "%pkg%", $packagesToInstall [$i], get_translation ( "INSTALLATION_SUCCESSFULL" ) ) . "
"; + } else { + echo "" . str_ireplace ( "%pkg%", $packagesToInstall [$i], get_translation ( "EXTRACTION_OF_PACKAGE_FAILED" ) ) . "
"; + } + } + @unlink ( $tmpFile ); + } + } + } + + clearCache (); + ?>" - class="btn btn-default"> + class="btn btn-default">
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back"> ++ Version: version);?> +
+ +manufacturerName){?> ++ +: + + +manufacturerUrl){?> +manufacturerName);?> + +manufacturerName);?> + +
+ +source){?> ++ : source);?>
+ + +customPermissions)){?> +
+ :
+
+ Version: version);?> +
+ +manufacturerName){?> ++ +: + + +manufacturerUrl){?> +manufacturerName);?> + +manufacturerName);?> + +
+ +source){?> ++ : source);?>
+ + +disableFunctions) > 0){?> +
+
+
| + | + + | + + | + |
|---|---|---|---|
| + data-btn-for="getName());?>"> getName());?> + + "> + + | +getName(), "version"));?> | + +isEmbedModule()) { + echo ""; + } + ?> | ++ + | + +
| + | + | + | + |
|---|---|---|---|
| + | + + | +
+ ✓
+ |
+ + + | +
| + | + | + | + |
|---|---|---|---|
| name);?> | +description);?> | +date);?> | ++ url)){?> + 🌐 + + | +
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
" - class="btn btn-warning"> + class="btn btn-warning">
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back"> +
csrf_token_html(); ?>- +
diff --git a/ulicms/content/modules/core_settings/templates/frontpage/form.php b/ulicms/content/modules/core_settings/templates/frontpage/form.php index e162c7e4a8..baa943cfba 100755 --- a/ulicms/content/modules/core_settings/templates/frontpage/form.php +++ b/ulicms/content/modules/core_settings/templates/frontpage/form.php @@ -16,7 +16,7 @@ ?>" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
@@ -21,7 +21,8 @@ class="btn btn-default btn-back">" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
@@ -17,7 +17,7 @@ class="btn btn-default btn-back"> ?> -
| @@ -37,6 +37,25 @@ class="btn btn-default btn-back"> + | |
| + | + |
| @@ -45,7 +64,8 @@ class="btn btn-default btn-back"> | |
| + class="btn btn-primary voffset2"> + |
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
+ class="btn btn-primary voffset2"> +" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
" - class="btn btn-default btn-back"> + class="btn btn-default btn-back">
@@ -36,18 +36,24 @@ class="btn btn-default btn-back"> src="" /> -+ +
+-- -
Um die Performance der Website zu verbessern, @@ -542,7 +543,7 @@ define("TRANSLATION_TARGET_PAGE_ID", "Erfolgsseite"); // Patch hochladen -define("TRANSLATION_INSTALL_PATCH_FROM_FILE", "Patch aus Datei installieren"); +define("TRANSLATION_INSTALL_PATCH_FROM_FILE", "Patch hochladen"); define("TRANSLATION_INSTALL_PATCH", "Patch installieren"); // 2-Faktor Authentifizierung diff --git a/ulicms/lang/en.php b/ulicms/lang/en.php index d96ef5ebce..a412270ed4 100755 --- a/ulicms/lang/en.php +++ b/ulicms/lang/en.php @@ -215,10 +215,12 @@ // Spamfilter Einstellungen define("TRANSLATION_SPAMFILTER_ENABLED", "Spamfilter enabled"); -define("TRANSLATION_BLACKLIST", "Black list"); +define("TRANSLATION_BLACKLIST", "Forbidden Words"); define("TRANSLATION_SPAM_COUNTRIES", "Users from the following countries may not write comments."); define("TRANSLATION_DISALLOW_CHINESE_CHARS", "Disallow chinese chars"); define("TRANSLATION_DISALLOW_CYRILLIC_CHARS", "Disallow cyrillic chars"); +define("TRANSLATION_DISALLOW_RTL_CHARS", "Disallow RTL-Languages (Arabic, Hebrew, Persian)"); + // Cache define("TRANSLATION_CACHE_TEXT1", "
Um die Performance der Website zu verbessern,
bietet das UliCMS eine Cache-Funktion.
@@ -544,7 +546,7 @@
define("TRANSLATION_TARGET_PAGE_ID", "Target Page");
// Patch upload
-define("TRANSLATION_INSTALL_PATCH_FROM_FILE", "Install patch from file");
+define("TRANSLATION_INSTALL_PATCH_FROM_FILE", "Upload patch");
define("TRANSLATION_INSTALL_PATCH", "Install patch");
// 2-Faktor Authentifizierung
diff --git a/ulicms/lib/CMSConfigSample.php b/ulicms/lib/CMSConfigSample.php
new file mode 100644
index 0000000000..c47f698fff
--- /dev/null
+++ b/ulicms/lib/CMSConfigSample.php
@@ -0,0 +1,18 @@
+has($cacheId)) {
$output = $adapter->get($cacheId);
} else {
+ $scss = new Compiler();
+ ;
foreach ($stylesheets as $stylesheet) {
$stylesheet = ltrim($stylesheet, "/");
if (is_file($stylesheet)) {
$ext = pathinfo($stylesheet, PATHINFO_EXTENSION);
- if ($ext == "css") {
+ if ($ext == "css" || $ext == "scss") {
$content = @file_get_contents($stylesheet);
if ($content) {
$content = normalizeLN($content, "\n");
+ if ($ext == "scss") {
+ $importPaths = getSCSSImportPaths();
+ if (is_array($importPaths)) {
+ $scss->setImportPaths($importPaths);
+ } else {
+ $scss->setImportPaths(dirname($stylesheet));
+ }
+ try {
+ $content = $scss->compile($content);
+ } catch (Exception $e) {
+ throw new SCSSCompileException("Compilation of $stylesheet failed: {$e->getMessage()}");
+ }
+ }
+
$content = minifyCss($content);
$output .= $content;
$output .= "\r\n";
$output .= "\r\n";
- if (filemtime($script) > $lastmod) {
- $lastmod = filemtime($script);
+ if (filemtime($stylesheet) > $lastmod) {
+ $lastmod = filemtime($stylesheet);
}
}
}
@@ -191,14 +234,17 @@ function getCombinedStylesheets()
' '
), '', $output);
- header("Content-Type: text/css");
- $len = mb_strlen($output, 'binary');
- header("Content-Length: " . $len);
-
- set_eTagHeaders($_GET["output_stylesheets"], $lastmod);
-
- echo $output;
- exit();
+ if (! $doReturn) {
+ header("Content-Type: text/css");
+ $len = mb_strlen($output, 'binary');
+ header("Content-Length: " . $len);
+
+ set_eTagHeaders($_GET["output_stylesheets"], $lastmod);
+
+ echo $output;
+ exit();
+ }
+ return $output;
}
/**
@@ -292,7 +338,7 @@ function getCombinedStylesheetURL()
{
$lastmod = 0;
foreach ($_SERVER["stylesheet_queue"] as $file) {
- if (is_file($file) and endsWith($file, ".css", $needle) and filemtime($file) > $lastmod) {
+ if (is_file($file) and (endsWith($file, ".css", $needle) or endsWith($file, ".scss", $needle)) and filemtime($file) > $lastmod) {
$lastmod = filemtime($file);
}
}
diff --git a/ulicms/lib/string_functions.php b/ulicms/lib/string_functions.php
index 4ecdb8e3c7..48bebc2359 100755
--- a/ulicms/lib/string_functions.php
+++ b/ulicms/lib/string_functions.php
@@ -239,6 +239,11 @@ function keywordsFromString($text)
}
}
+function stringOrNull($val)
+{
+ return StringHelper::isNotNullOrWhitespace($val) ? $val : null;
+}
+
// Aus einer Boolean einen String machen ("true" oder "false")
function strbool($value)
{
diff --git a/ulicms/lib/updates/down/042.sql b/ulicms/lib/updates/down/042.sql
new file mode 100644
index 0000000000..7474475363
--- /dev/null
+++ b/ulicms/lib/updates/down/042.sql
@@ -0,0 +1 @@
+delete from `{prefix}settings` where name = 'db_schema_version'
\ No newline at end of file
diff --git a/ulicms/lib/updates/down/043.sql b/ulicms/lib/updates/down/043.sql
new file mode 100644
index 0000000000..5554ec4665
--- /dev/null
+++ b/ulicms/lib/updates/down/043.sql
@@ -0,0 +1 @@
+ALTER TABLE `{prefix}forms` DROP COLUMN `enabled`
\ No newline at end of file
diff --git a/ulicms/lib/updates/down/044.sql b/ulicms/lib/updates/down/044.sql
new file mode 100644
index 0000000000..542639eb87
--- /dev/null
+++ b/ulicms/lib/updates/down/044.sql
@@ -0,0 +1 @@
+ALTER TABLE `{prefix}banner` DROP COLUMN `enabled`
\ No newline at end of file
diff --git a/ulicms/lib/updates/down/045.sql b/ulicms/lib/updates/down/045.sql
new file mode 100644
index 0000000000..d1bb020aa7
--- /dev/null
+++ b/ulicms/lib/updates/down/045.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `{prefix}banner`
+ DROP COLUMN date_from;
+
+ALTER TABLE `{prefix}banner`
+ DROP COLUMN date_to;
\ No newline at end of file
diff --git a/ulicms/lib/updates/down/046.sql b/ulicms/lib/updates/down/046.sql
new file mode 100644
index 0000000000..5177b18c99
--- /dev/null
+++ b/ulicms/lib/updates/down/046.sql
@@ -0,0 +1 @@
+delete from `{prefix}settings` where name = 'x_frame_options'
\ No newline at end of file
diff --git a/ulicms/lib/updates/down/047.sql b/ulicms/lib/updates/down/047.sql
new file mode 100644
index 0000000000..1c202f7766
--- /dev/null
+++ b/ulicms/lib/updates/down/047.sql
@@ -0,0 +1 @@
+delete from `{prefix}settings` where name = 'x_xss_protection'
\ No newline at end of file
diff --git a/ulicms/lib/updates/down/048.sql b/ulicms/lib/updates/down/048.sql
new file mode 100644
index 0000000000..46c3b226ff
--- /dev/null
+++ b/ulicms/lib/updates/down/048.sql
@@ -0,0 +1 @@
+delete from `{prefix}settings` where name = 'referrer_policy'
\ No newline at end of file
diff --git a/ulicms/lib/updates/up/042.sql b/ulicms/lib/updates/up/042.sql
new file mode 100644
index 0000000000..7474475363
--- /dev/null
+++ b/ulicms/lib/updates/up/042.sql
@@ -0,0 +1 @@
+delete from `{prefix}settings` where name = 'db_schema_version'
\ No newline at end of file
diff --git a/ulicms/lib/updates/up/043.sql b/ulicms/lib/updates/up/043.sql
new file mode 100644
index 0000000000..1864c47544
--- /dev/null
+++ b/ulicms/lib/updates/up/043.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `{prefix}forms`
+ADD `enabled` TINYINT NOT NULL DEFAULT '1'
+AFTER `name`;
diff --git a/ulicms/lib/updates/up/044.sql b/ulicms/lib/updates/up/044.sql
new file mode 100644
index 0000000000..65b13f4b51
--- /dev/null
+++ b/ulicms/lib/updates/up/044.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `{prefix}banner`
+ADD `enabled` TINYINT NOT NULL DEFAULT '1';
diff --git a/ulicms/lib/updates/up/045.sql b/ulicms/lib/updates/up/045.sql
new file mode 100644
index 0000000000..e6d03524c5
--- /dev/null
+++ b/ulicms/lib/updates/up/045.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `{prefix}banner`
+ ADD COLUMN date_from DATE DEFAULT NULL;
+
+ ALTER TABLE `{prefix}banner`
+ ADD COLUMN date_to DATE DEFAULT NULL;
\ No newline at end of file
diff --git a/ulicms/lib/updates/up/046.sql b/ulicms/lib/updates/up/046.sql
new file mode 100644
index 0000000000..71f232cfd6
--- /dev/null
+++ b/ulicms/lib/updates/up/046.sql
@@ -0,0 +1,5 @@
+INSERT INTO `{prefix}settings`
+ (name,
+ value)
+VALUES ('x_frame_options',
+ 'SAMEORIGIN');
\ No newline at end of file
diff --git a/ulicms/lib/updates/up/047.sql b/ulicms/lib/updates/up/047.sql
new file mode 100644
index 0000000000..2dc4d8b60f
--- /dev/null
+++ b/ulicms/lib/updates/up/047.sql
@@ -0,0 +1,5 @@
+INSERT INTO `{prefix}settings`
+ (name,
+ value)
+VALUES ('x_xss_protection',
+ 'sanitize');
\ No newline at end of file
diff --git a/ulicms/lib/updates/up/048.sql b/ulicms/lib/updates/up/048.sql
new file mode 100644
index 0000000000..3c3ac13db4
--- /dev/null
+++ b/ulicms/lib/updates/up/048.sql
@@ -0,0 +1,5 @@
+INSERT INTO `{prefix}settings`
+ (name,
+ value)
+VALUES ('referrer_policy',
+ 'no-referrer-when-downgrade');
\ No newline at end of file
diff --git a/ulicms/package-lock.json b/ulicms/package-lock.json
new file mode 100644
index 0000000000..f9f7fe3f0d
--- /dev/null
+++ b/ulicms/package-lock.json
@@ -0,0 +1,12 @@
+{
+ "name": "ulicms",
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "codemirror-minified": {
+ "version": "5.43.0",
+ "resolved": "https://registry.npmjs.org/codemirror-minified/-/codemirror-minified-5.43.0.tgz",
+ "integrity": "sha512-PzBtbcfGKn79A26mdWP8OBblSwq1wNnoH5Jud+6Wpx+PB6iBCSGlmFVxkKqSIPi+szEg+WXQa6pFAq6zXcHKRw=="
+ }
+ }
+}
diff --git a/ulicms/package.json b/ulicms/package.json
new file mode 100644
index 0000000000..469b9a7e67
--- /dev/null
+++ b/ulicms/package.json
@@ -0,0 +1,9 @@
+{
+ "name": "ulicms",
+ "description": "Open Source Content Management System",
+ "dependencies": {
+ "codemirror-minified": "*"
+ },
+ "license": "BSD",
+ "private": true
+}
\ No newline at end of file
diff --git a/ulicms/templating.php b/ulicms/templating.php
index e932914fdc..c510459ae3 100755
--- a/ulicms/templating.php
+++ b/ulicms/templating.php
@@ -1,938 +1,1088 @@
-';
- $html .= "\r\n";
-
- if (! is_null ( $og_description ) and ! empty ( $og_description )) {
- $html .= '';
- $html .= "\r\n";
- }
-
- $html .= '';
- $html .= "\r\n";
-
- $html .= '';
- $html .= "\r\n";
-
- $html .= '';
- $html .= "\r\n";
- $html .= '';
- $html .= "\r\n";
- }
-
- $html = apply_filter ( $html, "og_html" );
- return $html;
-}
-function get_og_data($systemname = "") {
- if (empty ( $systemname )) {
- $systemname = $_GET ["seite"];
- }
-
- if (empty ( $systemname )) {
- $systemname = get_frontpage ();
- }
- $query = db_query ( "SELECT og_title, og_type, og_image, og_description FROM " . tbname ( "content" ) . " WHERE systemname='" . db_escape ( $systemname ) . "' AND language='" . db_escape ( $_SESSION ["language"] ) . "'" );
- if (db_num_rows ( $query ) > 0) {
- return db_fetch_assoc ( $query );
- } else {
- return null;
- }
-}
-function get_all_combined_html() {
- $html = "";
- $html .= getCombinedStylesheetHtml ();
- $html .= "\r\n";
- $html .= combinedScriptHtml ();
- $html .= "\r\n";
- return $html;
-}
-function edit_button() {
- echo get_edit_button ();
-}
-function get_edit_button() {
- $html = "";
- if (is_logged_in () and ! containsModule ()) {
- $acl = new ACL ();
- if ($acl->hasPermission ( "pages" ) and Flags::getNoCache () && is_200 ()) {
- $id = get_ID ();
- $page = ContentFactory::getById ( $id );
- if (in_array ( $page->language, getAllLanguages ( true ) )) {
- $html .= "
">
-