openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 5c2a9ad888924c668e62feac3a55602885d63478
parent 50472ef721e366b30ed27a56fc6ff3c23e584604
Author: Jan Dankert <devnull@localhost>
Date:   Tue, 30 Oct 2012 23:21:16 +0100

Zusammenführen

Diffstat:
action/Action.class.php | 20++++++++++----------
action/FileAction.class.php | 6+++---
action/FilebrowserAction.class.php | 4+++-
action/FolderAction.class.php | 12+++++++++++-
action/IndexAction.class.php | 10++++++++++
action/LoginAction.class.php | 6+++++-
action/PageAction.class.php | 43+++++++------------------------------------
action/PageelementAction.class.php | 2++
action/TemplateAction.class.php | 163+++++++++++++++++++++++++++----------------------------------------------------
action/TreeAction.class.php | 2+-
action/WorkbenchAction.class.php | 4++--
build.ini | 6++++--
config/config-default.php | 24++++++++++++++----------
db/db.class.php | 6+++---
db/mysql.class.php | 9++++++++-
db/mysqli.class.php | 2+-
db/pdo.class.php | 2+-
db/postgresql.class.php | 6++++--
editor/editor/config-openrat.js | 6+++---
functions/common.inc.php | 18------------------
language/de.ini.php | 199++++++++++++++++++++++++++++++++++++++++---------------------------------------
language/en.ini.php | 122++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
language/es.ini.php | 28++++++++++++++--------------
language/fr.ini.php | 28++++++++++++++--------------
language/it.ini.php | 28++++++++++++++--------------
language/ru.ini.php | 176++++++++++++++++++++++++++++++++++++++++----------------------------------------
model/Page.class.php | 3+++
model/Value.class.php | 31+++++++++++++++++++------------
themes/default/css/openrat.css.php | 37+++++++++++++++++++++++++++++++------
themes/default/include/html/inputarea.inc.php | 4++--
themes/default/include/html/label.inc.php | 6+++---
themes/default/include/html/link.inc.php | 10+++++++---
themes/default/include/html/page.inc.php | 81+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
themes/default/js/openrat.js | 2++
themes/default/js/plugin/jquery-plugin-orLinkify.js | 2+-
themes/default/layout/index.php | 3++-
themes/default/layout/perspective/administration.ini.php | 4++--
themes/default/layout/perspective/header.php | 113-------------------------------------------------------------------------------
themes/default/layout/perspective/normal.ini.php | 4++--
themes/default/layout/perspective/normal.php | 24------------------------
themes/default/layout/perspective/window.php | 110+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
themes/default/layout/perspective/workbench.php | 24++++++++++++++++++++++++
themes/default/templates/file/edit.tpl.src.xml | 2++
themes/default/templates/file/editvalue.tpl.src.xml | 4----
themes/default/templates/file/preview.tpl.src.xml | 8--------
themes/default/templates/file/value.tpl.src.xml | 4++++
themes/default/templates/filebrowser/browse.tpl.src.xml | 53+++++++++++++++++++++++++++++++++++++++++++++++++----
themes/default/templates/folder/createfile.tpl.src.xml | 63+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
themes/default/templates/folder/createfolder.tpl.src.xml | 2+-
themes/default/templates/login/license.tpl.src.xml | 27+++++++++++++++++++++++----
themes/default/templates/page/preview.tpl.src.xml | 23++++++-----------------
themes/default/templates/pageelement/edit.tpl.src.xml | 2+-
themes/default/templates/template/edit.tpl.src.xml | 55++++++++++++++++++++++++++++++++++++++++++++++++++-----
themes/default/templates/template/el.tpl.src.xml | 40----------------------------------------
themes/default/templates/template/src.tpl.src.xml | 19++-----------------
themes/default/templates/tree/show.tpl.src.xml | 7-------
themes/default/templates/tree/tree.tpl.src.xml | 7+++++++
util/Http.class.php | 19++++++++++++++++++-
util/Preferences.class.php | 53+++++++++++++++++++++++++++++++++++++++++++++++++++++
util/Publish.class.php | 51++++++++++++++++++++++++++++++++++-----------------
60 files changed, 1082 insertions(+), 747 deletions(-)

diff --git a/action/Action.class.php b/action/Action.class.php @@ -354,6 +354,7 @@ class Action public function forward() { Session::close(); + global $conf; $db = db_connection(); @@ -378,8 +379,9 @@ class Action // Ablaufzeit für den Inhalt auf aktuelle Zeit setzen. header('Expires: '.substr(date('r',time()-date('Z')),0,-5).'GMT',false ); - - header('X-Content-Security-Policy: '.'allow *; script-src \'self\'; options \'inline-script\''); + + if ( $conf['security']['content-security-policy'] ) + header('X-Content-Security-Policy: '.'allow \'self\'; img-src: *; script-src \'self\'; options inline-script'); $httpAccept = getenv('HTTP_ACCEPT'); @@ -449,7 +451,6 @@ class Action if ( isset($this->actionConfig[$this->subActionName]['menu'])) $windowTitle = 'menu_title_'.$this->actionName.'_'.$this->actionConfig[$this->subActionName]['menu']; - global $conf; global $REQ; global $PHP_SELF; global $HTTP_SERVER_VARS; @@ -716,17 +717,16 @@ class Action /** * Ermitelt den Zeichensatz fuer die Ausgabe. * - * Falls für die Datenbank-Verbindung ein Zeichensatz angegeben ist, so wird - * dieser genommen und in HTTP-Response-Header sowieso auch im HTML-Kopf verwendet. - * - * Falls nicht vorhanden, wird der Zeichensatz aus der geladenen Sprachdatei verwendet. Diese - * ergibt sich dann aus der Sprache, die der Browser anfordert. + * Seit Version 1.1 werden alle Ausgaben in UTF-8 kodiert. Falls die + * Datenbank intern eine andere Kodierung verwendet, so wird diese bei + * der Datenbankanbindung umgewandelt. Nach außen wird die Kodierung + * grundsätzlich in UTF-8 durchgeführt. * - * @return String Zeichensatz + * @return String Zeichensatz, konstant UTF-8. */ protected function getCharset() { - return charset(); + return 'UTF-8'; } diff --git a/action/FileAction.class.php b/action/FileAction.class.php @@ -46,7 +46,7 @@ class FileAction extends ObjectAction /** * Ersetzt den Inhalt mit einer anderen Datei */ - function replace() + public function editPost() { $upload = new Upload(); @@ -64,7 +64,7 @@ class FileAction extends ObjectAction } - function savevalue() + public function valuePost() { $this->file->value = $this->getRequestVar('value',OR_FILTER_RAW); $this->file->saveValue(); @@ -423,7 +423,7 @@ class FileAction extends ObjectAction /** * Anzeigen des Inhaltes */ - function editvalue() + function valueView() { global $conf; // MIME-Types aus Datei lesen diff --git a/action/FilebrowserAction.class.php b/action/FilebrowserAction.class.php @@ -121,7 +121,9 @@ class FilebrowserAction extends ObjectAction if ( ! $this->folder->isRoot ) $this->setTemplateVar('up_url',Html::url('filebrowser','browse',$this->folder->parentid,array('CKEditorFuncNum'=>$funcNum))); + $user = Session::getUser(); $this->setTemplateVar('writable',$this->folder->hasRight(ACL_WRITE) ); + $this->setTemplateVar('style',$user->style ); $list = array(); @@ -146,7 +148,7 @@ class FilebrowserAction extends ObjectAction if ( $o->isFolder ) $list[$id]['url' ] = Html::url('filebrowser','browse',$id,array('CKEditorFuncNum'=>$funcNum) ); else - $list[$id]['url' ] = "javascript:window.top.opener.CKEDITOR.tools.callFunction($funcNum,'".Html::url('file','preview',$id,array('oid'=>'__OID__'.$id.'__'))."','');window.top.close();window.top.opener.focus();"; + $list[$id]['url' ] = "javascript:window.top.opener.CKEDITOR.tools.callFunction($funcNum,'".Html::url('file','show',$id,array('oid'=>'__OID__'.$id.'__'))."','');window.top.close();window.top.opener.focus();"; diff --git a/action/FolderAction.class.php b/action/FolderAction.class.php @@ -1208,7 +1208,17 @@ class FolderAction extends ObjectAction - + public function rootView() + { + $rootFolder = new Folder( Folder::getRootFolderId() ); + $rootFolder->load(); + + $this->setTemplateVar('rootfolderid' ,$rootFolder->id ); + $this->setTemplateVar('rootfoldername',$rootFolder->name); + } + + + /** * Reihenfolge bearbeiten. */ diff --git a/action/IndexAction.class.php b/action/IndexAction.class.php @@ -35,6 +35,16 @@ class IndexAction extends Action public function showView() { + global $conf; + + $user = Session::getUser(); + if ( is_object($user) ) + $style = $user->style; + else + $style = 'default'; + + + require('themes/default/layout/index.php'); exit; } diff --git a/action/LoginAction.class.php b/action/LoginAction.class.php @@ -960,6 +960,7 @@ class LoginAction extends Action else { Session::set('perspective','login'); + $this->setStyle('default'); $this->refresh(); } } @@ -1813,6 +1814,9 @@ class LoginAction extends Action { $software = array(); + $software[] = array('name' =>'OpenRat Content Management System', + 'url' =>'http://www.openrat.de/', + 'license'=>'GPL v2'); $software[] = array('name' =>'jQuery Core Javascript Framework', 'url' =>'http://jquery.com/', 'license'=>'MPL, GPL v2'); @@ -1828,7 +1832,7 @@ class LoginAction extends Action $software[] = array('name' =>'960 Grid System CSS', 'url' =>'http://960.gs/', 'license'=>'GPL v3, MIT'); - $software[] = array('name' =>'TAR file format from Josh Barger', + $software[] = array('name' =>'TAR file format', 'url' =>'http://www.phpclasses.org/package/529', 'license'=>'LGPL'); $software[] = array('name' =>'JSON file format', diff --git a/action/PageAction.class.php b/action/PageAction.class.php @@ -511,7 +511,7 @@ class PageAction extends ObjectAction } } - $this->setTemplateVar('preview_url',Html::url('page','view',$this->page->objectid,array('target'=>'none') ) ); + $this->setTemplateVar('preview_url',Html::url('page','show',$this->page->objectid,array('withIcons'=>'1') ) ); $this->setTemplateVar('el',$list); } @@ -620,7 +620,7 @@ class PageAction extends ObjectAction */ function previewView() { - $this->setTemplateVar('preview_url',Html::url('page','show',$this->page->objectid,array('target'=>'none') ) ); + $this->setTemplateVar('preview_url',Html::url('page','show',$this->page->objectid ) ); } /** @@ -629,6 +629,9 @@ class PageAction extends ObjectAction function showView() { // Seite definieren + if ( $this->hasRequestVar('withIcons') ) + $this->page->icons = true; + $this->page->load(); $this->page->generate(); $this->page->write(); @@ -647,45 +650,13 @@ class PageAction extends ObjectAction require( $this->page->tmpfile() ); else readfile( $this->page->tmpfile() ); + + exit(); } /** - * Die Seite im Bearbeitungsmodus anzeigen - * - * Bei editierbaren Feldern wird ein Editor-Ikon vorangestellt. - */ - public function viewView() - { - // Editier-Icons anzeigen - $this->page->icons = true; - - $this->page->load(); - $this->page->generate(); - $this->page->write(); - - header('Content-Type: '.$this->page->mimeType().'; charset='.$this->getCharset() ); - - // HTTP-Header mit Sprachinformation setzen. - $language = Session::getProjectLanguage(); - header('Content-Language: '.$language->isoCode); - - - // Wenn - if ( ( config('publish','enable_php_in_page_content')=='auto' && $this->page->template->extension == 'php') || - config('publish','enable_php_in_page_content')===true ) - require( $this->page->tmpfile() ); - else - readfile( $this->page->tmpfile() ); - - // Inhalt ist ausgegeben... Skript beenden. - exit; - } - - - - /** * Den Quellcode der Seite anzeigen * * Alle HTML-Sonderzeichen werden maskiert diff --git a/action/PageelementAction.class.php b/action/PageelementAction.class.php @@ -104,6 +104,8 @@ class PageelementAction extends Action */ public function propView() { + Http::notFound("",""); + exit(); $language = Session::getProjectLanguage(); $this->value->languageid = $language->languageid; $this->value->objectid = $this->page->objectid; diff --git a/action/TemplateAction.class.php b/action/TemplateAction.class.php @@ -297,6 +297,7 @@ class TemplateAction extends Action */ function showView() { + header('Content-Type: '.$this->template->mimeType().'; charset='.$this->getCharset() ); $text = $this->template->src; foreach( $this->template->getElementIds() as $elid ) @@ -334,41 +335,60 @@ class TemplateAction extends Action */ function editView() { - $text = htmlentities( $this->template->src ); + // Elemente laden + $list = array(); + + foreach( $this->template->getElementIds() as $elid ) + { + $element = new Element( $elid ); + $element->load(); + + $list[$elid] = array(); + $list[$elid]['id' ] = $elid; + $list[$elid]['name' ] = $element->name; + $list[$elid]['description'] = $element->desc; + $list[$elid]['type' ] = $element->type; + + unset( $element ); + } + $this->setTemplateVar('elements',$list); + + + $text = Text::encodeHtml( $this->template->src ); $text = str_replace("\n",'<br/>',$text); foreach( $this->template->getElementIds() as $elid ) { $element = new Element( $elid ); $element->load(); - $url = Html::url( 'element','name',$elid ); + $url = 'javascript:openNewAction(\''.$element->name.'\',\'element\',\''.$elid.'\');'; $text = str_replace('{{'.$elid.'}}', - '<a href="'.$url.'" class="el_'. - $element->getTypeClass().'" target="cms_main_main" title="'.$element->desc.'">{{'. + '<a href="'.$url.'" class="element el_'. + $element->getTypeClass().'" title="'.$element->desc.'">{{'. $element->name.'}}</a>', $text ); $text = str_replace('{{-&gt;'.$elid.'}}', - '<a href="'.$url.'" class="el_'. - $element->getTypeClass().'" target="cms_main_main" title="'.$element->desc.'">{{-&gt;'. + '<a href="'.$url.'" class="element el_'. + $element->getTypeClass().'" title="'.$element->desc.'">{{-&gt;'. $element->name.'}}</a>', $text ); $text = str_replace('{{IFEMPTY:'.$elid.':BEGIN}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'. + '<a href="'.$url.'" class="element el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'. $element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}</a>', $text ); $text = str_replace('{{IFEMPTY:'.$elid.':END}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'. + '<a href="'.$url.'" class="element el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'. $element->name.':'.lang('TEMPLATE_SRC_END').'}}</a>', $text ); $text = str_replace('{{IFNOTEMPTY:'.$elid.':BEGIN}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'. + '<a href="'.$url.'" class="element el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'. $element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}</a>', $text ); $text = str_replace('{{IFNOTEMPTY:'.$elid.':END}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'. + '<a href="'.$url.'" class="element el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'. $element->name.':'.lang('TEMPLATE_SRC_END').'}}</a>', $text ); @@ -379,31 +399,6 @@ class TemplateAction extends Action } - // Anzeigen der Template-Elemente - // - function elView() - { - global $conf_php; - $list = array(); - - foreach( $this->template->getElementIds() as $elid ) - { - $element = new Element( $elid ); - $element->load(); - - $list[$elid] = array(); - $list[$elid]['id' ] = $elid; - $list[$elid]['name'] = $element->name; - $list[$elid]['desc'] = $element->desc; - $list[$elid]['type'] = $element->type; - - unset( $element ); - } - $this->setTemplateVar('el',$list); - } - - - function srcelementView() { $elements = array(); @@ -431,82 +426,34 @@ class TemplateAction extends Action */ function srcView() { - if ( $this->isEditMode() ) - { - $text = $this->template->src; - - foreach( $this->template->getElementIds() as $elid ) - { - $element = new Element( $elid ); - $element->load(); - - $text = str_replace('{{'.$elid.'}}', - '{{'.$element->name.'}}', - $text ); - $text = str_replace('{{->'.$elid.'}}', - '{{->'.$element->name.'}}', - $text ); - $text = str_replace('{{IFEMPTY:'.$elid.':BEGIN}}', - '{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}', - $text ); - $text = str_replace('{{IFEMPTY:'.$elid.':END}}', - '{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_END').'}}', - $text ); - $text = str_replace('{{IFNOTEMPTY:'.$elid.':BEGIN}}', - '{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}', - $text ); - $text = str_replace('{{IFNOTEMPTY:'.$elid.':END}}', - '{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_END').'}}', - $text ); - } + $text = $this->template->src; - $this->setTemplateVar( 'src',$text ); - } - else + foreach( $this->template->getElementIds() as $elid ) { - $text = htmlentities( $this->template->src ); - $text = str_replace("\n",'<br/>',$text); - - foreach( $this->template->getElementIds() as $elid ) - { - $element = new Element( $elid ); - $element->load(); - $url = Html::url( 'element','name',$elid ); - - $text = str_replace('{{'.$elid.'}}', - '<a href="'.$url.'" class="el_'. - $element->getTypeClass().'" target="cms_main_main" title="'.$element->desc.'">{{'. - $element->name.'}}</a>', - $text ); - $text = str_replace('{{-&gt;'.$elid.'}}', - '<a href="'.$url.'" class="el_'. - $element->getTypeClass().'" target="cms_main_main" title="'.$element->desc.'">{{-&gt;'. - $element->name.'}}</a>', - $text ); - - $text = str_replace('{{IFEMPTY:'.$elid.':BEGIN}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'. - $element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}</a>', - $text ); - $text = str_replace('{{IFEMPTY:'.$elid.':END}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFEMPTY').':'. - $element->name.':'.lang('TEMPLATE_SRC_END').'}}</a>', - $text ); - - $text = str_replace('{{IFNOTEMPTY:'.$elid.':BEGIN}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'. - $element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}</a>', - $text ); - $text = str_replace('{{IFNOTEMPTY:'.$elid.':END}}', - '<a href="'.$url.'" class="el_'.$element->getTypeClass().'" title="'.$element->desc.'">{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'. - $element->name.':'.lang('TEMPLATE_SRC_END').'}}</a>', - $text ); - - unset( $element ); - } - - $this->setTemplateVar('src',$text); + $element = new Element( $elid ); + $element->load(); + + $text = str_replace('{{'.$elid.'}}', + '{{'.$element->name.'}}', + $text ); + $text = str_replace('{{->'.$elid.'}}', + '{{->'.$element->name.'}}', + $text ); + $text = str_replace('{{IFEMPTY:'.$elid.':BEGIN}}', + '{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}', + $text ); + $text = str_replace('{{IFEMPTY:'.$elid.':END}}', + '{{'.lang('TEMPLATE_SRC_IFEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_END').'}}', + $text ); + $text = str_replace('{{IFNOTEMPTY:'.$elid.':BEGIN}}', + '{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_BEGIN').'}}', + $text ); + $text = str_replace('{{IFNOTEMPTY:'.$elid.':END}}', + '{{'.lang('TEMPLATE_SRC_IFNOTEMPTY').':'.$element->name.':'.lang('TEMPLATE_SRC_END').'}}', + $text ); } + + $this->setTemplateVar( 'src',$text ); } diff --git a/action/TreeAction.class.php b/action/TreeAction.class.php @@ -210,7 +210,7 @@ class TreeAction extends Action /** * Anzeigen des Baumes */ - public function showView() + public function treeView() { return; $this->load(); diff --git a/action/WorkbenchAction.class.php b/action/WorkbenchAction.class.php @@ -72,8 +72,8 @@ class WorkbenchAction extends Action global $viewconfig; $viewconfig = parse_ini_file('themes/default/layout/perspective/'.$this->perspective.'.ini.php',true); - require_once('themes/default/layout/perspective/header.php'); - require_once('themes/default/layout/perspective/normal.php'); + require_once('themes/default/layout/perspective/window.php'); + require_once('themes/default/layout/perspective/workbench.php'); // Ausgabe fertig. exit; } diff --git a/build.ini b/build.ini @@ -1,3 +1,5 @@ ; auto-generated by /home/dankert/bin/openrat-increment-build - do not change -build=932 -date=Fri, 26 Oct 2012 00:16:30 +0200 +build=937 +date="Tue, 30 Oct 2012 21:03:30 +0100" +message="Prepare for build number 936" +changeset=71c8b143f99c diff --git a/config/config-default.php b/config/config-default.php @@ -671,23 +671,26 @@ $conf['publish']['url']='absolute'; $conf['publish']['enable_php_in_page_content']=false; $conf['publish']['enable_php_in_file_content']=false; $conf['publish']['escape_8bit_characters']=false; +$conf['publish']['encode_utf8_in_html']=true; $conf['publish']['negotiation'] = array(); $conf['publish']['negotiation']['page_negotiate_type']=true; $conf['publish']['negotiation']['page_negotiate_language']=true; $conf['publish']['negotiation']['file_negotiate_type']=true; -$conf['publish']['project'] = array(); -$conf['publish']['project']['publish_dir']="/var/www/"; -$conf['publish']['project']['override_publish_dir']=true; -$conf['publish']['project']['system_command']="sudo -u xyz /usr/local/bin/mirror.sh {dirbase}"; -$conf['publish']['project']['system_command']='0'; -$conf['publish']['project']['override_system_command']=true; +$conf['publish']['filesystem'] = array(); +$conf['publish']['filesystem']['per_project']=true; +$conf['publish']['filesystem']['directory']='/var/www/'; +$conf['publish']['command'] = array(); +$conf['publish']['command']['per_project']=true; +$conf['publish']['command']['enable']=false; +$conf['publish']['command']['command']=''; $conf['publish']['ftp'] = array(); $conf['publish']['ftp']['enable']=true; +$conf['publish']['ftp']['per_project']=true; $conf['publish']['ftp']['port']='21'; -$conf['publish']['ftp']['host']="ftp.example.com"; -$conf['publish']['ftp']['path']="/path/to/site"; -$conf['publish']['ftp']['user']='agent_smith'; -$conf['publish']['ftp']['pass']='smith'; +$conf['publish']['ftp']['host']=''; +$conf['publish']['ftp']['path']=''; +$conf['publish']['ftp']['user']='anonymous'; +$conf['publish']['ftp']['pass']='mail@example.com'; $conf['replace'] = array(); $conf['replace']['']='0'; $conf['replace']['']='0'; @@ -786,6 +789,7 @@ $conf['security']['user'] = array(); $conf['security']['user']['show_admin_mail']=true; $conf['security']['user']['show_mail']=true; $conf['security']['user']['send_message']=true; +$conf['security']['content-security-policy']=true; $conf['style'] = array(); $conf['style']['grey']=array(); diff --git a/db/db.class.php b/db/db.class.php @@ -146,7 +146,7 @@ class DB // SQL nach Verbindungsaufbau ausfuehren. - if ( isset($this->conf['connection_sql']) && ! empty($this->conf['connection_sql']) ) + if ( ! empty($this->conf['connection_sql']) ) { $cmd = $this->conf['connection_sql']; $ok = $this->client->query($cmd); @@ -178,7 +178,7 @@ class DB die('SQL-Query must be an object'); // Vorbereitete Datenbankabfrage ("Prepared Statement") - if ( isset($this->conf['prepare']) && $this->conf['prepare'] ) + if ( $this->conf['prepare'] ) { $this->client->clear(); @@ -228,7 +228,7 @@ class DB } } - if ( isset($this->conf['autocommit']) && @$this->conf['autocommit']) + if ( $this->conf['autocommit'] ) if ( method_exists($this->client,'commit') ) $this->client->commit(); diff --git a/db/mysql.class.php b/db/mysql.class.php @@ -49,7 +49,7 @@ class DB_mysql $pw = $conf['password']; $db = $conf['database']; - if ( isset($conf['port']) ) + if ( !empty($conf['port']) ) $host .= ':'.$conf['port']; if ( $conf['persistent'] ) @@ -81,6 +81,13 @@ class DB_mysql } } + // Falls es sich um eine UTF-8-Datenbank handelt, dann setzen wir + // hier explizit den Zeichensatz für alle Anfragen. + $dbCharset = $conf['charset']; + if ( empty($dbCharset) || $dbCharset == 'UTF-8' ) + @mysql_query("SET NAMES 'utf8';",$this->connection); + + return true; } diff --git a/db/mysqli.class.php b/db/mysqli.class.php @@ -59,7 +59,7 @@ class DB_mysqli $db = $conf['database']; $host = '127.0.0.1'; - if ( isset($conf['port']) ) + if ( !empty($conf['port']) ) $host .= ':'.$conf['port']; // 5.3.0 - Added the ability of persistent connections. diff --git a/db/pdo.class.php b/db/pdo.class.php @@ -53,7 +53,7 @@ class DB_pdo $user = $conf['user' ]; $pw = $conf['password']; - if ( isset($conf['convert_to_lowercase']) && $conf['convert_to_lowercase'] ) + if ( !empty($conf['convert_to_lowercase']) ) $this->lowercase = true; $options = array(); diff --git a/db/postgresql.class.php b/db/postgresql.class.php @@ -51,7 +51,7 @@ class DB_postgresql $pw = $conf['password']; $db = $conf['database']; - if ( isset($conf['port']) ) + if ( !empty($conf['port']) ) $host .= ':'.$conf['port']; if ( $conf['persistent'] ) @@ -64,7 +64,9 @@ class DB_postgresql $this->error = 'Function does not exist: '.$connect_function.' Postgresql is not available'; return false; } - + + Logger::debug('postgresql: connecting to: '."host=$host, dbname=$db"); + if ( $pw != '' ) $this->connection = @$connect_function( "host=$host dbname=$db user=$user password=$pw" ); elseif ( $user != '' ) diff --git a/editor/editor/config-openrat.js b/editor/editor/config-openrat.js @@ -11,13 +11,13 @@ CKEDITOR.editorConfig = function( config ) //baseHref: OR_THEMES_EXT_DIR+'../editor/editor/' config.baseHref = ''; config.skin = 'v2'; - config.filebrowserUploadUrl = './dispatcher.php?action=filebrowser&subaction=directupload&name=upload'; + //config.filebrowserUploadUrl = './dispatcher.php?action=filebrowser&subaction=directupload&name=upload'; config.filebrowserBrowseUrl = './dispatcher.php?action=filebrowser&subaction=browse'; config.toolbar = 'Openrat'; config.toolbar_Openrat = [ /* Eigene Toolbar für OpenRat */ - ['Save','Preview','-'], /*,'Templates'*/ - ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'], + ['Preview','-'], /*,'Templates'*/ + ['Cut','Copy','Paste','PasteText','PasteFromWord'], ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'], '/', diff --git a/functions/common.inc.php b/functions/common.inc.php @@ -122,24 +122,6 @@ function istrue( $val ) return false; } -/** - * Liefert den für die Ausgabe zu verwendenden Zeichensatz. - * Falls konfiguriert, wird das Charset aus der DB-Konfiguration - * genommen. Sonst das Charset aus der Sprachdatei. - * - * @return Zeichensatz, z.B. "UTF-8", "ISO-8859-1". - */ -function charset() -{ - $db = db_connection(); - - if ( isset($db->conf['charset']) ) - return $db->conf['charset']; - else - //return lang('CHARSET'); - return 'US-ASCII'; -} - /** diff --git a/language/de.ini.php b/language/de.ini.php @@ -8,6 +8,7 @@ + ACCESSKEY_MAIN_ADD="H" ACCESSKEY_MAIN_ADMINISTRATION=S ACCESSKEY_MAIN_CONTENT="I" @@ -106,6 +107,7 @@ ACL_TRANSMIT = "Recht vererben" ACL_WRITE_ABBREV = "SCHR" ACL_WRITE = "Inhalt bearbeiten" ADDITIONAL_INFO = "Weitere Informationen" +BACK="Zurück" BUTTON_BACK_DESC = "Zurück" BUTTON_BACK = "Zurück" BUTTON_CANCEL = "Abbrechen" @@ -119,6 +121,7 @@ BUTTON_OK = "OK" BUTTON_UNDO =Rückgängig CACHE_FILENAME = "Cache-Dateiname" CALENDAR=Kalender +CANCEL="Abbrechen" CHARSET ="UTF-8" COMPRESSION_BZ2 = "bzip2" COMPRESSION_GZ = "GZip (GNU Zip)" @@ -157,6 +160,7 @@ DATE_WEEKDAY5 = Freitag DATE_WEEKDAY6 = Samstag DESCRIPTION = Beschreibung DOCUMENT_TREE = "Dokument-Baum" +EDIT="Bearbeiten" EDITOR_EDITLINK = "Verknüpfung bearbeiten" EDITOR = "Editor" EDITOR_EDITTEXT = "Text bearbeiten" @@ -222,6 +226,12 @@ EL_INSERT_DESC = "Einfügen einer Seite. Es wird entweder genau eine Seite oder EL_INSERT = "Einfügen" EL_INSERT_INLINE="Internes Einfügen bei Veröffentlichung" EL_INSERT_SSI="Einfügen per Serverside-Include (SSI)" +EL_LINKDATE_DATE_CREATED = "Verlinktes Objekt: Datum/Zeit der Erstellung" +EL_LINKDATE_DATE_PUBLISHED = "Verlinktes Objekt: Datum/Zeit der Veröffentlichung" +EL_LINKDATE_DATE_SAVED = "Verlinktes Objekt: Datum/Zeit der letzten Speicherung" +EL_LINKDATE_DESC = "Das Link-Info-Datum stellt ein Datum eines verlinkten Objektes bereit" +EL_LINKDATE = "Link-Datum-Info" +EL_LINKDATE = "Link-Info-Datum" EL_LINK_DESC = "Ein Link ist eine Verknüpfung mit einer Seite oder einer Datei" EL_LINK_FILE = "Link auf Dateien" EL_LINK_IMAGE_DATA_URI = "Link auf Bilder mit Data-URI" @@ -232,22 +242,21 @@ EL_LINKINFO_CREATE_USER_MAIL = "Erstellungsautor: E-Mail" EL_LINKINFO_CREATE_USER_TEL = "Erstellungsautor: Telefonnummer" EL_LINKINFO_CREATE_USER_USERNAME = "Erstellungsautor: Benutzername" EL_LINKINFO_DESC = "Eine Eigenschaften eines verknüpften Objektes als Wert verwenden" +EL_LINKINFO_DESCRIPTION = "Beschreibung des verknüpften Objektes" +EL_LINKINFO_FILENAME = "Dateiname (ohne Erweiterung)" +EL_LINKINFO_FULL_FILENAME = "Kompletter Dateiname mit Pfadangabe" EL_LINKINFO_HEIGHT = "Bild-Höhe" EL_LINKINFO_ID = "ID des verknüpften Objektes" -EL_LINKINFO_NAME = "Name des verknüpften Objektes" -EL_LINKINFO_DESCRIPTION = "Beschreibung des verknüpften Objektes" EL_LINKINFO_LASTCH_USER_DESC = "Letzter Benutzer: Beschreibung" EL_LINKINFO_LASTCH_USER_FULLNAME = "Letzter Benutzer: Voller Name" EL_LINKINFO_LASTCH_USER_MAIL = "Letzter Benutzer: E-Mail" EL_LINKINFO_LASTCH_USER_TEL = "Letzter Benutzer: Telefonnummer" EL_LINKINFO_LASTCH_USER_USERNAME = "Letzter Benutzer: Benutzername" EL_LINKINFO = "Link-Info" -EL_LINKDATE = "Link-Datum-Info" EL_LINKINFO_MIME-TYPE = "Mime-Type" +EL_LINKINFO_NAME = "Name des verknüpften Objektes" EL_LINKINFO_PAGE_DESC = "Seite: Beschreibung" EL_LINKINFO_WIDTH = "Bild-Breite" -EL_LINKINFO_FILENAME = "Dateiname (ohne Erweiterung)" -EL_LINKINFO_FULL_FILENAME = "Kompletter Dateiname mit Pfadangabe" EL_LINK_LINK = "Link auf Verknüpfungen" EL_LINK = "Link (Verknüpfung)" EL_LINK_NONE = "Alle" @@ -297,11 +306,6 @@ EL_SELECT = "Auswahlliste" EL_SELECT_DESC = "Der Inhalt wird vom Redakteur aus einer vorzugebenden Liste ausgewählt" EL_TEXT_DESC = "Das einfache Textfeld dient für einzeilige Texte bis max. 255 Zeichen" EL_TEXT = "Text (einfach)" -EL_LINKDATE_DATE_CREATED = "Verlinktes Objekt: Datum/Zeit der Erstellung" -EL_LINKDATE_DATE_PUBLISHED = "Verlinktes Objekt: Datum/Zeit der Veröffentlichung" -EL_LINKDATE_DATE_SAVED = "Verlinktes Objekt: Datum/Zeit der letzten Speicherung" -EL_LINKDATE_DESC = "Das Link-Info-Datum stellt ein Datum eines verlinkten Objektes bereit" -EL_LINKDATE = "Link-Info-Datum" EMPTY=Leer ERROR_ACCESS_DENIED_DESC = "Sie haben keine ausreichenden Rechte, um auf das ausgewählte Objekt zuzugreifen" ERROR_ACCESS_DENIED = "Zugriff verweigert" @@ -322,6 +326,7 @@ ERROR_USER_PW = "Kennwortänderung fehlgeschlagen" EXAMPLE=Beispiel EXPORT_DESC = "Mit dem Export können Sie Dateien aus einem Projektordner in das lokale Dateisystem des Servers kopieren" EXPORT = "Export" +FILEBROWSER="Datei auswählen" FILE_DELETE_DESC = "Löschen der Datei" FILE_EXTENSION = Dateiendung FILE_IMAGE_FORMAT ="Bildformat" @@ -383,7 +388,6 @@ GLOBAL_ARCHIVE =Archiv GLOBAL_ARCHIVE_DESC = "Alle historischen Inhalte zu diesem Platzhalter." GLOBAL_CHANGE = "ändern" GLOBAL_CHANGE_TO = "Wechseln zu" -GLOBAL_OPEN_ALL = "Alle öffnen" GLOBAL_CLEAN_AFTER_PUBLISH = "Zielverzeichnis anschließend aufräumen und alte Dateien entfernen." GLOBAL_CLIPBOARD = Ablage GLOBAL_COMMENT = Kommentar @@ -441,6 +445,7 @@ GLOBAL_LISTING = Liste GLOBAL_LOGIN = Anmeldung GLOBAL_LOG = Log GLOBAL_MAKE_DEFAULT = "Auf Standard setzen" +GLOBAL_MENU_TITLE_FILEBROWSER_BROWSE="Auswahl" GLOBAL_MINUTE = Minute GLOBAL_MINUTES = Minuten GLOBAL_MODELS_DESC = "Mit Modellen künnen verschiedene Ansichten eines Projektes erzeugt werden, z.B. neben HTML kann es ein WML-Modell für WAP-Seiten geben" @@ -464,6 +469,7 @@ GLOBAL_NOTICES ="Hinweis" GLOBAL_NOT_LOGGED_IN = "nicht angemeldet" GLOBAL_NOW = "Jetzt" GLOBAL_NR ="Nr." +GLOBAL_OPEN_ALL = "Alle öffnen" GLOBAL_OR ="oder" GLOBAL_OTHER_DESC = "Dateitransfer, Suche nach Objekten" GLOBAL_OTHER =Sonstiges @@ -484,7 +490,6 @@ GLOBAL_READONLY_DESC ="Das System ist im Nur-Lesen Modus. Sie können keine Date GLOBAL_READONLY ="Nur-Lesen Modus" GLOBAL_REFRESH = Aktualisieren GLOBAL_REGISTER_DESC = "Sie können sich registrieren. Sie erhalten dann Anmeldedaten per E-Mail und koennen sich sofort anmelden." -REGISTER_NOT_ENABLED = "Die Registrierung ist deaktiviert." GLOBAL_REGISTER = "Registrieren" GLOBAL_RELEASE_DESC = "Inhalt zur Veröffentlichung freigeben" GLOBAL_RELEASE = "Freigeben" @@ -508,8 +513,8 @@ GLOBAL_TEMPLATES_DESC = "Bearbeiten Sie Vorlagen, mit welchen Seiten erzeugt wer GLOBAL_TEMPLATES = Vorlagen GLOBAL_TEMPLATE = Vorlage GLOBAL_TO = nach -GLOBAL_TREE = "Übersicht" GLOBAL_TRANSFER = "Transfer" +GLOBAL_TREE = "Übersicht" GLOBAL_TYPE = Typ GLOBAL_UNDO = "Rückgängig" GLOBAL_UNKNOWN_TEXT = "kein Text verfügbar" @@ -530,6 +535,7 @@ HELP_DATE_ANSIDATE = "Alternativ können Sie Datum/Zeit im ANSI-Format eingeben" HELP_DATE = "Legen Sie einen Zeitpunkt als Platzhalterinhalt fest" HELP = "Hilfe" HELP_LANGUAGE_DELETE = "Löschen dieser Sprache, <strong>Achtung</strong>, alle Seiteninhalte in dieser Sprache werden unwiederbringlich gelöscht!" +HISTORY=Verlauf HTTP_REALM="Bitte anmelden" HTTP_URL = "HTTP-Url" IMAGE = "Bild" @@ -538,8 +544,11 @@ IMAGE_OLD_SIZE = "Bisherige Bildgröße" INHERIT_RIGHTS = "Berechtigungen in allen untergeordneten Objekten zurücksetzen und die vererbbaren Berechtigungen dieses Ordners dort anwenden." IS_NO="Nein" IS_YES="Ja" +JAVASCRIPT_REQUIRED="Bitte Javascript aktivieren" LANGUAGE_ISOCODE = "ISO Code" LASTCHANGE_USER = "Letzter Änderungsautor" +LICENSE="Lizenz" +LINK_OPEN_IN_NEW_WINDOW="In neuem Fenster öffnen" LINK_TARGET ="Verknüpfungsziel" LINK_URL = "Verknüpfte Url" LIST_ENTRY_EMPTY="Nicht ausgewählt" @@ -567,13 +576,29 @@ MAIL_TEXT_PASSWORD_COMMIT_CODE ="Guten Tag {name},;;Ihr Code zum Anfordern eines MAIL_TEXT_PASSWORD_NEW ="Guten Tag {name},;;Ihr neues Kennwort lautet: {password};;Bitte notieren Sie sich dieses gut und löschen Sie anschließend diese E-Mail.;;Vielen Dank." MAIL_TEXT_REGISTER_COMMIT_CODE ="Guten Tag,;;Sie oder jemand anderes möchte sich für die Nutzung des OpenRat-CMS registrieren, hiermit erhalten Sie den notwendigen Registrierungscode.;;Ihr Registrierungs-Code: {code};;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein.;;Falls Sie diese Registrierung nicht durchgeführt haben, so ignorieren Sie bitte diese E-Mail.;;Vielen Dank für Ihr Interesse." MAIL_TEXT_USER_MAIL = "Guten Tag {name},;;Ihre Zugangsdaten lauten wie folgt:;;Login: {username};Kennwort: {password};;Notieren Sie sich das Kennwort gut und löschen Sie anschließend diese E-Mail.;;Vielen Dank." +MENU_ACLFORM="Hinzufügen" MENU_ADD_DESC = "Neu hinzufügen" +MENU_ADDEL="Neues Element" MENU_ADD = Neu +MENU_APPLICATIONS="Anwendungen" +MENU_APPLICATIONS_DESC="Weitere Anwendungen starten" +MENU_ARCHIVE="Archiv" +MENU_ARCHIVE="Archiv" +MENU_CHANGETEMPLATE="Vorlage wechseln" +MENU_CLIPBOARD="Zwischenablage" +MENU_COMPRESS_DESC =Die Datei komprimieren +MENU_COMPRESS =Komprimieren +MENU_CONSOLE="Konsole" MENU_CONTENT_DESC = "Inhalt" MENU_CONTENT =Inhalt MENU_CREATE_DESC = "In diesem Ordner ein neues Objekt anlegen" +MENU_CREATEFILE="Datei hochladen" +MENU_CREATEFOLDER="Neuer Unterordner" MENU_CREATE_KEY = N +MENU_CREATELINK="Neue Verknüpfung" MENU_CREATE = Neu +MENU_CREATEPAGE="Neue Seite" +MENU_DELETE="Löschen" MENU_EDIT = Bearbeiten MENU_EDIT_DESC = "Bearbeiten" MENU_EDIT_KEY = B @@ -590,14 +615,19 @@ MENU_ELEMENT_TYPE_DESC =Den Platzhalter-Typ ändern MENU_ELEMENT_TYPE =Typ MENU_EL = Inhalt MENU_EL_KEY = L +MENU_EXPORT_DESC = "In eine andere Datenbank exportieren" +MENU_EXPORT = Export +MENU_EXTENSION="Erweiterung" +MENU_EXTRACT = Auspacken +MENU_EXTRACT_DESC = Archiv auspacken MENU_FILE_ACLFORM_DESC =Ein Recht zu dieser Datei hinzufügen MENU_FILE_ACLFORM =Hinzufügen +MENU_FILEBROWSER_BROWSE="Anzeigen" +MENU_FILEBROWSER_BROWSE_DESC="Diesen Ordner anzeigen" MENU_FILE_COMPRESS_DESC =Die Datei komprimieren MENU_FILE_COMPRESS =Komprimieren MENU_FILE_EDIT_DESC ="Diese Datei durch eine andere ersetzen." MENU_FILE_EDIT ="Ersetzen" -MENU_FILE_SHOW_DESC ="Diese Datei anzeigen" -MENU_FILE_SHOW ="Vorschau" MENU_FILE_EDITVALUE_DESC =Inhalt bearbeiten MENU_FILE_EDITVALUE =Inhalt bearbeiten MENU_FILE_EXTRACT =Auspacken @@ -610,8 +640,10 @@ MENU_FILE_REMOVE =Datei löschen MENU_FILE_REMOVE =Löschen MENU_FILE_RIGHTS =Berechtigungen MENU_FILE_RIGHTS_DESC =Rechte dieser Datei ansehen +MENU_FILE_SHOW_DESC ="Diese Datei anzeigen" MENU_FILE_SHOWPROP_DESC = Informationen und Eigenschaften zu dieser Datei anzeigen MENU_FILE_SHOWPROP =Information +MENU_FILE_SHOW ="Vorschau" MENU_FILE_SIZE =Bildgröße MENU_FILE_SIZE_DESC =Bildgröße ändern MENU_FILE_UNCOMPRESS =Dekomprimieren @@ -650,10 +682,6 @@ MENU_FOLDER_SHOWPROP = Information MENU_FORM_DESC = "Eingabemaske für alle Platzhalter" MENU_FORM = Formular MENU_FORM_KEY = F -GLOBAL_MENU_TITLE_FILEBROWSER_BROWSE="Auswahl" -FILEBROWSER="Datei auswählen" -MENU_FILEBROWSER_BROWSE="Anzeigen" -MENU_FILEBROWSER_BROWSE_DESC="Diesen Ordner anzeigen" MENU_GROUP_ADD_DESC ="Gruppe hinzufügen" MENU_GROUP_ADD ="Neue Gruppe hinzufügen" MENU_GROUP_ADDUSER_DESC ="Weiteren Benutzer in diese Gruppe aufnehmen" @@ -666,27 +694,20 @@ MENU_GROUP_REMOVE_DESC ="Gruppe entfernen" MENU_GROUP_REMOVE ="Entfernen" MENU_GROUP_RIGHTS=Berechtigungen MENU_GROUP_RIGHTS_DESC=Berechtigungen dieser Gruppe anzeigen und bearbeiten +MENU_GROUPS_DESC = "Gruppen bearbeiten" +MENU_GROUPS = Gruppen +MENU_GROUPS_KEY = G MENU_GROUP_USERS_DESC ="Benutzer in dieser Gruppe anzeigen" MENU_GROUP_USERS ="Mitgliedschaften" MENU_HELP_DESC=Onlinehilfe MENU_HELP=Hilfe MENU_IMPORT_DESC ="Dateien aus lokalem Dateiordner des Servers in einen Projektordner kopieren" MENU_IMPORT =Import -MENU_APPLICATIONS="Anwendungen" -MENU_APPLICATIONS_DESC="Weitere Anwendungen starten" -MENU_LOGIN_LOGIN =Anmeldung MENU_INDEX_LOGOUT ="Abmelden" MENU_INDEX_LOGOUT_DESC ="Von dieser Anwendung abmelden." MENU_INDEX_MENU =Projekt auswählen -MENU_PASSWORD_DESC ="Wenn Sie hier Kennwort nicht mehr wissen, können Sie es sich zusenden lassen." -MENU_PASSWORD ="Kennwort vergessen" -PASSWORD_NOT_ENABLED="Das Zusenden eines neuen Kennwortes ist deaktiviert." -MENU_PROJECTMENU_DESC ="Wählen Sie ein Projekt aus, das Sie bearbeiten möchten" -MENU_PROJECTMENU ="Projekt auswählen" -MENU_REGISTER_DESC ="Sie müssen registriert sein, um diese Anwendung nutzen zu können." -MENU_REGISTER ="Registrieren" -MENU_LOGIN =Anmelden -MENU_LOGIN_DESC ="Um die Anwendung zu nutzen, muessen sich sich anmelden." +MENU_INFO_DESC="Informationen anzeigen" +MENU_INFO="Info" MENU_LANGUAGE_ADD_DESC =Sprache hinzufügen MENU_LANGUAGE_ADD =Hinzufügen MENU_LANGUAGE_ADVANCED_DESC=Eigenschaften der Sprache einzeln bearbeiten @@ -697,6 +718,7 @@ MENU_LANGUAGE_LISTING_DESC = "Liste der verfügbaren Sprachen anzeigen" MENU_LANGUAGE_LISTING =Liste MENU_LANGUAGE_REMOVE_DESC =Sprache entfernen MENU_LANGUAGE_REMOVE =Entfernen +MENU_LICENSE="Lizenz" MENU_LINK_ACLFORM_DESC =Ein Recht zu dieser Verknüpfung hinzufügen MENU_LINK_ACLFORM =Hinzufügen MENU_LINK_EDIT_DESC = "Ziel bearbeiten" @@ -707,10 +729,19 @@ MENU_LINK_RIGHTS =Berechtigungen MENU_LINK_RIGHTS_DESC =Rechte dieser Verknüpfung ansehen MENU_LINK_SHOWPROP_DESC =Informationen und Eigenschaften der Verknüpfung anzeigen MENU_LINK_SHOWPROP = Information +MENU_LINK="Verknüpfung" MENU_LISTING_DESC ="Liste anzeigen" MENU_LISTING_KEY ="L" MENU_LISTING =Liste +MENU_LOGIN =Anmelden +MENU_LOGIN_DESC ="Um die Anwendung zu nutzen, muessen sich sich anmelden." +MENU_LOGIN_LOGIN =Anmeldung +MENU_MAIL="E-Mail" +MENU_MAINTENANCE_DESC = "Integrität prüfen" +MENU_MAINTENANCE = "Wartung" MENU_MEMBERSHIPS_DESC = "Bearbeiten der Mitgliedschaften" +MENU_MEMBERSHIPS_DESC = "Mitgliedschaften bearbeiten" +MENU_MEMBERSHIPS =Mitgliedschaften MENU_MEMBERSHIPS = "Mitgliedschaften" MENU_MODEL_ADD_DESC =Variante hinzufügen MENU_MODEL_ADD =Hinzufügen @@ -720,6 +751,9 @@ MENU_MODEL_LISTING_DESC =Liste aller Projektvarianten anzeigen MENU_MODEL_LISTING =Liste MENU_MODEL_REMOVE_DESC = "Diese Projektvariante entfernen" MENU_MODEL_REMOVE =Entfernen +MENU_NAME="Name" +MENU_OPENID="Open-Id" +MENU_OTHER="Andere" MENU_PAGE_ACLFORM_DESC =Ein Recht zu dieser Seite hinzufügen MENU_PAGE_ACLFORM =Hinzufügen MENU_PAGE_CHANGETEMPLATE_DESC =Austausch der Seitenvorlage @@ -749,17 +783,21 @@ MENU_PAGE_PROP_DESC =Eigenschaften der Seite bearbeiten MENU_PAGE_PROP =Eigenschaften MENU_PAGE_PUB_DESC ="Seite veröffentlichen" MENU_PAGE_PUB ="Veröffentlichen" -MENU_PAGE_SHOW = Vorschau -MENU_PAGE_SHOW_DESC = "Die Vorschau zu dieser Seite anzeigen (sog. WYSIWYG)" MENU_PAGE_RIGHTS = Berechtigungen MENU_PAGE_RIGHTS_DESC =Rechte dieser Seite ansehen +MENU_PAGE_SHOW_DESC = "Die Vorschau zu dieser Seite anzeigen (sog. WYSIWYG)" MENU_PAGE_SHOWPROP_DESC = Informationen und Eigenschaften der Seite anzeigen MENU_PAGE_SHOWPROP = Informationen +MENU_PAGE_SHOW = Vorschau MENU_PAGE_SRC_DESC = "Den erzeugten Quellcode anzeigen" MENU_PAGE_SRC = "Quellcode" +MENU_PAGES="Seiten" +MENU_PASSWORD_DESC ="Wenn Sie hier Kennwort nicht mehr wissen, können Sie es sich zusenden lassen." +MENU_PASSWORD ="Kennwort vergessen" MENU_PHPINFO_DESC="Anzeigen von Systeminformationen" MENU_PHPINFO = "System-Information" MENU_PHPINFO="Systeminformationen" +MENU_PREVIEW="Vorschau" MENU_PROFILE_EDIT =Bearbeiten MENU_PROFILE_EDIT_DESC =Ihre Benutzereinstellungen bearbeiten MENU_PROFILE_GROUPS_DESC=Mitgliedschaft in Gruppen @@ -774,17 +812,14 @@ MENU_PROJECT_ADD_DESC ="Neues Projekt anlegen" MENU_PROJECT_ADD ="Neu" MENU_PROJECT_EDIT_DESC = "Die Projekteinstellungen bearbeiten" MENU_PROJECT_EDIT = "Einstellungen" -MENU_EXPORT_DESC = "In eine andere Datenbank exportieren" -MENU_EXPORT = Export -MENU_INFO_DESC="Informationen anzeigen" -MENU_INFO="Info" MENU_PROJECT_LIST =Alle Projekte MENU_PROJECT_LISTING_DESC =Alle Projekte anzeigen MENU_PROJECT_LISTING =Projekte -MENU_MAINTENANCE_DESC = "Integrität prüfen" -MENU_MAINTENANCE = "Wartung" +MENU_PROJECTMENU_DESC ="Wählen Sie ein Projekt aus, das Sie bearbeiten möchten" +MENU_PROJECTMENU ="Projekt auswählen" MENU_PROJECT_REMOVE_DESC = "Das Projekt entfernen" MENU_PROJECT_REMOVE = "Entfernen" +MENU_PROJECTTIMELINE="Verlauf" MENU_PROP_DESC = "Eigenschaften wie Name, Beschreibung bearbeiten" MENU_PROP = Eigenschaften MENU_PROP_KEY = E @@ -793,25 +828,30 @@ MENU_PUB_KEY = V MENU_PUB = "Veröffentlichen" MENU_PW_DESC = "Das Kennwort des Benutzers ändern" MENU_PW = Kennwort +MENU_REGISTER_DESC ="Sie müssen registriert sein, um diese Anwendung nutzen zu können." +MENU_REGISTER ="Registrieren" +MENU_REMOVE="Löschen" MENU_RIGHTS = Berechtigungen MENU_RIGHTS_DESC = "Berechtigungen anzeigen und bearbeiten" MENU_RIGHTS_KEY = X -MENU_SETTINGS = Einstellungen -MENU_SETTINGS_DESC = "Einstellungen bearbeiten" -MENU_SETTINGS_KEY = E -MENU_GROUPS = Gruppen -MENU_GROUPS_DESC = "Gruppen bearbeiten" -MENU_GROUPS_KEY = G MENU_SEARCH_CONTENT_DESC = "Nach einem Inhalt suchen" MENU_SEARCH_CONTENT = "Inhalt" MENU_SEARCH_PROP_DESC = "Nach einer Eigenschaft suchen" MENU_SEARCH_PROP = "Eigenschaft" +MENU_SEARCH="Suche" +MENU_SETTINGS_DESC = "Einstellungen bearbeiten" +MENU_SETTINGS = Einstellungen +MENU_SETTINGS_KEY = E +MENU_SHOW = "Anzeigen" MENU_SHOW_DESC = "Anzeigen" MENU_SHOW_KEY = A -MENU_SHOW = "Anzeigen" +MENU_SIZE =Bildgröße +MENU_SIZE_DESC =Bildgröße ändern MENU_SRC_DESC = "Quellcode" +MENU_SRCELEMENT="Element einfügen" MENU_SRC_KEY = Q MENU_SRC = Quellcode +MENU_STRUCTURE="Struktur" MENU_TEMPLATE_ADD_DESC =Eine neue Vorlage hinzufügen MENU_TEMPLATE_ADDEL_DESC =Ein Platzhalter hinzufügen MENU_TEMPLATE_ADDEL =Hinzufügen @@ -835,6 +875,7 @@ MENU_TEMPLATE_SRC_DESC = "Quellcode bearbeiten" MENU_TEMPLATE_SRCELEMENT_DESC = "Einen Platzhalter in den Quelltext einzufügen" MENU_TEMPLATE_SRCELEMENT = "Platzhalter Einfügen" MENU_TEMPLATE_SRC =Quellcode +MENU_TIMELINE="Verlauf" MENU_TITLE_ELEMENT_EDIT =Platzhalter bearbeiten MENU_TITLE_FILE_EDIT ="Datei bearbeiten" MENU_TITLE_FILE_PROP =Eigenschaften der Datei @@ -880,11 +921,16 @@ MENU_TITLE_USER_MEMBERSHIPS =Mitgliedschaften MENU_TITLE_USER_PW =Kennwort ändern MENU_TITLE_USER_RIGHTS="Berechtigungen" MENU_TREE_CONTENT="Inhalt" +MENU_TREE_DESC=Navigation +MENU_TREE=Navigation MENU_TREE_SETTINGS="Einstellungen" MENU_TREETITLE_ADMINISTRATION =Administration MENU_TREETITLE_ADMINISTRATION_DESC = "Wechsel zur Systemadministration" MENU_TREETITLE_PROJECTMENU_DESC = "Anderes Projekt zur Bearbeitung auswählen" MENU_TREETITLE_PROJECTMENU = Projekte +MENU_TYPE="Typ" +MENU_UNCOMPRESS =Dekomprimieren +MENU_UNCOMPRESS_DESC =Die komprimierte Datei dekomprimieren MENU_USER_ADD_DESC = "Einen neuen Benutzer hinzufügen" MENU_USER_ADDGROUP =Gruppe hinzufügen MENU_USER_ADD =Hinzufügen @@ -892,10 +938,9 @@ MENU_USER_EDIT = "Bearbeiten" MENU_USER_EDIT_DESC = "Benutzerdaten bearbeiten" MENU_USER_GROUPS_DESC = "Mitgliedschaften des Benutzers in Gruppen bearbeiten" MENU_USER_GROUPS =Mitgliedschaften -MENU_MEMBERSHIPS_DESC = "Mitgliedschaften bearbeiten" -MENU_MEMBERSHIPS =Mitgliedschaften MENU_USER_LISTING_DESC = "Alle Benutzer anzeigen" MENU_USER_LISTING =Liste +MENU_USERPROJECTTIMELINE="Meine Änderungen" MENU_USER_PW_DESC =Kennwort ändern MENU_USER_PW =Kennwort MENU_USER_REMOVE_DESC = "Benutzer löschen" @@ -904,6 +949,7 @@ MENU_USER_RIGHTS="Berechtigungen" MENU_USER_RIGHTS_DESC="Alle Berechtigungen des Benutzers anzeigen" MENU_USERS_DESC = "Bearbeiten der Mitgliedschaften von Benutzern in dieser Gruppe" MENU_USERS = "Mitgliedschaften" +MENU_USERTIMELINE="Meine Änderungen" MODE_EDIT = "Bearbeiten" MODE_EDIT_CANCEL = "Abbrechen" MODE_EDIT_CANCEL_DESC = "Eingaben verwerfen und die Bearbeitung abbrechen" @@ -928,8 +974,8 @@ NOTICE_DONE ="Der Vorgang wurde ausgeführt." NOTICE_ERROR = "Bei der Aktion trat ein Fehler auf." NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="Die in der Benutzerverwaltung eingetragenen Gruppenzugehörigkeiten stehen möglicherweise in Konflikt mit den Gruppenzugehörigkeiten aus dem Verzeichnisdienst. Beim Login ueber den Verzeichnisdienst werden die hier eingetragenenen Gruppenzugehörigkeiten überschrieben." NOTICE_IMAGE_RESIZED = "Das Bild wurde geändert." -NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="Das Verändern dieses Bildtyps ist leider nicht möglich." NOTICE_IMAGE_RESIZING_NOT_AVAILABLE="Das Verändern der Bildgröße ist momentan nicht möglich. Bitte stellen Sie sicher, dass die GD-Bibliothek installiert ist." +NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="Das Verändern dieses Bildtyps ist leider nicht möglich." NOTICE_IMPORTED ="Datei wurde importiert." NOTICE_INPUT_NEW_IMAGE_SIZE = "Bitte geben Sie die neue Bildgröße an, entweder Größenfaktor oder Breite oder Höhe." NOTICE_LINKED ="Verknüpfung angelegt." @@ -957,14 +1003,14 @@ NOTICE_PUBLISHED_ERROR ="Wurde nicht veröffentlicht." NOTICE_PUBLISHED ="Wurde veröffentlicht." NOTICE_SAVED = "Wurde gespeichert." NOTICE_SEQUENCE_CHANGED = "Die Reihenfolge wurde geändert." +NOTICE_UNEXPECTED_CHARS = "Ihre Eingabe enthielt ungültige Zeichen, diese wurden entfernt." NOTICE_USER_ADDED = "Der Benutzer wurde hinzugefügt." NOTICE_USER_ADDED_TO_GROUP = "Die Mitgliedschaften in der Gruppe wurden aktualisiert, {count} Benutzer hinzugefügt." NOTICE_USER_ALREADY_IN_DATABASE = "Der Benutzer ist bereits vorhanden. Bitte wählen Sie einen anderen Benutzernamen." NOTICE_VALUE_SAVED = "Inhalt wurde gespeichert." -NOTICE_UNEXPECTED_CHARS = "Ihre Eingabe enthielt ungültige Zeichen, diese wurden entfernt." +OPENID_NOT_ENABLED="Das Login mit OpenId ist deaktiviert." OPENID="Open-ID" OPENID_USER="Open-ID Benutzername" -OPENID_NOT_ENABLED="Das Login mit OpenId ist deaktiviert." OPTIONS="Optionen" PAGE_ARCHIVE_DESC = "Wählen Sie eine Version aus, um den Inhalt zu übernehmen" PAGE_DELETE_DESC = "Löschen der Seite, <strong>Achtung</strong> alle Inhalte dieser Seite werden unwiederbringlich gelöscht!" @@ -990,6 +1036,7 @@ PAGE_TEMPLATE_NEW = "Neue Vorlage" PAGE_TEMPLATE_OLD = "Bisherige Vorlage" PASSWORD_CODE =Code für Kennwortanforderung PASSWORD_CODE_HELP =Sie haben per E-Mail einen Zahlencode erhalten. Diesen tragen Sie bitte jetzt in das Eingabefeld ein. +PASSWORD_NOT_ENABLED="Das Zusenden eines neuen Kennwortes ist deaktiviert." PREFERENCES = Einstellungen PROJECT_CHECK_FILES="Integritätsprüfung der Ordnerstruktur" PROJECT_CHECK_LIMIT="Entfernen von alten Inhalten aus dem Archiv" @@ -1014,9 +1061,10 @@ PROJECT_LOCALPATH_DESC = "Lokales Verzeichnis, Format: <tt>/pfad/.../pfad/</tt>. PROJECTMODEL_DELETE_DESC = "Löschen des Projektmodells, alle Templates mit diesem Modell werden gelöscht!" PROJECT_NAME = Projektbezeichnung PROJECT_SELECT_DESC = "Wenn Sie ein anderes Projekt bearbeiten möchten, so wählen Sie hier eines aus." -PROJECT_TARGET_DIR = Zielverzeichnis PROJECT_TARGET_DIR_DESC = Das lokale Dateiverzeichnis auf dem Server. In diesem werden die zu veröffentlichenden Dateien gespeichert. +PROJECT_TARGET_DIR = Zielverzeichnis PROP_USERINFO = "Benutzer" +REGISTER_NOT_ENABLED = "Die Registrierung ist deaktiviert." SEARCH_CONTENT = "Suche nach Inhalt" SEARCH_DESC="Im Projekt wird nach dem Suchbegriff gesucht" SEARCH_PROP = "Suche nach Eigenschaft" @@ -1027,6 +1075,7 @@ SESSION_EXPIRED="Ihre Sitzung ist abgelaufen oder Ihnen fehlen Rechte zur Ausfue SETTING_ALWAYS_EDIT = "Falls möglich, ein Formular sofort zum Bearbeiten öffnen" SETTING="Einstellung" SETTING_IGNORE_OK_NOTICES = "Erfolgsmeldungen (OK) nicht anzeigen" +SRC="Quellcode" START_DESC="Start" START = "Start" TEMPLATE_DELETE_DESC = "Löschen der Seitenvorlage incl. Platzhalter" @@ -1097,8 +1146,8 @@ USER_MAIL_INVALID = "E-Mail Adresse ist ungültig" USER_MAIL_NEW_PASSWORD = "E-Mail mit dem neuen Kennwort an Benutzer senden" USER_MEMBERSHIPS = "Mitgliedschaften" USER_NEW_MAIL = "Neue E-Mail-Adresse" -USER_NEW_PASSWORD = "Neues Kennwort" USER_NEW_PASSWORD_INPUT = "Neues Kennwort eingeben" +USER_NEW_PASSWORD = "Neues Kennwort" USER_NEW_PASSWORD_REPEAT = "Neues Kennwort Wiederholung" USER_PASSWORD = Kennwort USER_PASSWORD_TIMEOUT =Kennwort läuft ab @@ -1113,48 +1162,4 @@ USER_USERNAME_DESC = "Mit diesem Namen meldet sich der Benutzer am System an" USER_YOURPROFILE = "Persönliche Einstellungen" VALUE = Inhalt WEEK="Woche" -JAVASCRIPT_REQUIRED="Bitte Javascript aktivieren" -HISTORY=Verlauf WINDOW_FULLSCREEN="Vollbild" -MENU_MAIL="E-Mail" -BACK="Zurück" -MENU_ARCHIVE="Archiv" -MENU_LINK="Verknüpfung" -MENU_CHANGETEMPLATE="Vorlage wechseln" -LINK_OPEN_IN_NEW_WINDOW="In neuem Fenster öffnen" -MENU_ADDEL="Neues Element" -MENU_SRCELEMENT="Element einfügen" -MENU_REMOVE="Löschen" -MENU_DELETE="Löschen" -MENU_CREATEFOLDER="Neuer Unterordner" -MENU_CREATELINK="Neue Verknüpfung" -MENU_CREATEFILE="Datei hochladen" -MENU_CREATEPAGE="Neue Seite" -MENU_NAME="Name" -MENU_EXTENSION="Erweiterung" -MENU_PAGES="Seiten" -MENU_TYPE="Typ" -MENU_LICENSE="Lizenz" -MENU_STRUCTURE="Struktur" -MENU_SEARCH="Suche" -MENU_ARCHIVE="Archiv" -MENU_OTHER="Andere" -MENU_ACLFORM="Hinzufügen" -MENU_OPENID="Open-Id" -MENU_PREVIEW="Vorschau" -MENU_CLIPBOARD="Zwischenablage" -MENU_CONSOLE="Konsole" -CANCEL="Abbrechen" -MENU_USERPROJECTTIMELINE="Meine Änderungen" -MENU_USERTIMELINE="Meine Änderungen" -MENU_PROJECTTIMELINE="Verlauf" -MENU_TIMELINE="Verlauf" - -MENU_COMPRESS =Komprimieren -MENU_COMPRESS_DESC =Die Datei komprimieren -MENU_UNCOMPRESS =Dekomprimieren -MENU_UNCOMPRESS_DESC =Die komprimierte Datei dekomprimieren -MENU_EXTRACT = Auspacken -MENU_EXTRACT_DESC = Archiv auspacken -MENU_SIZE =Bildgröße -MENU_SIZE_DESC =Bildgröße ändern diff --git a/language/en.ini.php b/language/en.ini.php @@ -4,6 +4,9 @@ ; English language file ; Please send new translations to cmstrl@jandankert.de thanks. ; + + + ACCESSKEY_MAIN_ADD="A" ACCESSKEY_MAIN_ADMINISTRATION=A ACCESSKEY_MAIN_CONTENT="C" @@ -21,6 +24,7 @@ ACCESSKEY_MAIN_PW="P" ACCESSKEY_MAIN_RIGHTS=R ACCESSKEY_MAIN_SHOW=V ACCESSKEY_MAIN_SRC=S +ACCESSKEY_WINDOW_ACLFORM=G ACCESSKEY_WINDOW_ACL=G ACCESSKEY_WINDOW_ADDEL=G ACCESSKEY_WINDOW_ADD=G @@ -102,6 +106,7 @@ ACL_TRANSMIT = "Inherit rights" ACL_WRITE_ABBREV = "WRI" ACL_WRITE = "Edit content" ADDITIONAL_INFO = "More Info:" +BACK="Back" BUTTON_BACK = "Back" BUTTON_BACK_DESC = "Back" BUTTON_CANCEL ="Cancel" @@ -116,6 +121,7 @@ BUTTON_OK ="Ok" BUTTON_UNDO ="Undo" CACHE_FILENAME = "Cache-Dateiname" CALENDAR="Calendar" +CANCEL="Cancel" CHARSET ="ISO-8859-1" COMPRESSION_BZ2 = "bzip2" COMPRESSION_GZ = "GZip (GNU Zip)" @@ -154,6 +160,7 @@ DATE_WEEKDAY5 = Friday DATE_WEEKDAY6 = Saturday DESCRIPTION = Description DOCUMENT_TREE = "Document tree" +EDIT="Edit" EDITOR_EDITLINK = "Edit Link" EDITOR = "Editor" EDITOR_EDITTEXT = "Text-Editor" @@ -222,6 +229,11 @@ EL_INSERT_INLINE="Internal Insert while publishing" EL_INSERT = "Insert" EL_INSERT_SSI="Insert via Serverside-Include (SSI)" EL_LINK = "Anchor" +EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" +EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" +EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" +EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" +EL_LINKDATE = "Link-Info-Date" EL_LINK_DESC = "Link to a page or a file" EL_LINK_FILE = "Link to files" EL_LINK_IMAGE_DATA_URI = "Link to images with Data-URI" @@ -232,14 +244,20 @@ EL_LINKINFO_CREATE_USER_FULLNAME = "Create-User: Full name" EL_LINKINFO_CREATE_USER_MAIL = "Create-User: E-Mail" EL_LINKINFO_CREATE_USER_TEL = "Create-User: Telephone Number" EL_LINKINFO_CREATE_USER_USERNAME = "Create-User: Username" +EL_LINKINFO_DESCRIPTION = "Description of linked object" EL_LINKINFO_DESC = "Use an Property out of a linked object" +EL_LINKINFO_FILENAME = "Filename (without extension)" +EL_LINKINFO_FULL_FILENAME = "Complete filename with path" EL_LINKINFO_HEIGHT = "Height" +EL_LINKINFO_ID = "ID of linked object" EL_LINKINFO_LASTCH_USER_DESC = "Last User: Description" EL_LINKINFO_LASTCH_USER_FULLNAME = "Last User: Full name" EL_LINKINFO_LASTCH_USER_MAIL = "Last User: E-Mail" EL_LINKINFO_LASTCH_USER_TEL = "Last User: Telephone number" EL_LINKINFO_LASTCH_USER_USERNAME = "Last User: Username" EL_LINKINFO_MIME-TYPE = "Mime-Type" +EL_LINKINFO_NAME = "Name of linked object" +EL_LINKINFO_PAGE_DESC = "Page: Description" EL_LINKINFO_WIDTH = "Width" EL_LINK_LINK = "Link to anchors" EL_LINK_NONE = "All" @@ -312,6 +330,7 @@ EXAMPLE=Example EXAMPLE = "Example" EXPORT_DESC = "Use the export for copying files to the server" EXPORT = "Export" +FILEBROWSER="Choose a file" FILE_DELETE_DESC = "Removing the file" FILE_EXTENSION = "File extension" FILE_IMAGE_FORMAT ="Image format" @@ -377,6 +396,7 @@ GLOBAL_ALL_LANGUAGES = "All languages" GLOBAL_ARCHIVE =Archive GLOBAL_ARCHIVE_DESC = "All archived values of this element." GLOBAL_CHANGE = "Change" +GLOBAL_CHANGE_TO = "Change to" GLOBAL_CLEAN_AFTER_PUBLISH = "Cleanup target directory and remove old files in it." GLOBAL_CLIPBOARD = Ablage GLOBAL_COMMENT = "comment" @@ -433,6 +453,7 @@ GLOBAL_LISTING = "List" GLOBAL_LOGIN = "Login" GLOBAL_LOG = Log GLOBAL_MAKE_DEFAULT = "Set to standard" +GLOBAL_MENU_TITLE_FILEBROWSER_BROWSE="Selection" GLOBAL_MINUTE = Minute GLOBAL_MINUTES = Minutes GLOBAL_MODEL = "Model" @@ -457,6 +478,7 @@ GLOBAL_NOTICES ="Notice" GLOBAL_NOT_LOGGED_IN = "not logged in" GLOBAL_NOW = "Now" GLOBAL_NR ="No." +GLOBAL_OPEN_ALL = "Open all" GLOBAL_OR ="or" GLOBAL_OTHER_DESC = "File transfer, search for objects" GLOBAL_OTHER ="Other Stuff" @@ -504,6 +526,7 @@ GLOBAL_TIME = Time GLOBAL_TODAY = "Today" GLOBAL_TO = to GLOBAL_TRANSFER = "Transfer" +GLOBAL_TREE = "Overview" GLOBAL_TYPE = Type GLOBAL_UNDO = "Undo" GLOBAL_UNKNOWN_TEXT = "no text available" @@ -525,6 +548,7 @@ HELP_DATE = "Please choose a date as value" HELP = "Help" HELP_LANGUAGE_DELETE = "Remove this language.<strong>Be careful</strong>, all Content of this language will be lost!" HELP_LONGTEXT_WIKI = "In this textelement you can use text quickformatting" +HISTORY = "History" HTTP_REALM="Please login" HTTP_URL = "HTTP-Url" IFEMPTY ="If_Element_is_empty" @@ -536,11 +560,14 @@ INHERIT_RIGHTS = "Reset rights in all Sub-objects and inherit the inheritable ri IS_NO="No" ISOCODE = "ISO Code" IS_YES="Yes" +JAVASCRIPT_REQUIRED="Please enable Javascript" LANGUAGE_ISOCODE = "ISO Code" LASTCHANGE_USER = "Last User" LAST_MONTH = "Last Month" LAST_YEAR = "Last Year" +LICENSE="License" LINK = "Link" +LINK_OPEN_IN_NEW_WINDOW="Open in new window" LINK_TARGET ="Link target" LINK_URL = "linked URL" LIST_ENTRY_EMPTY="Not selected" @@ -569,13 +596,29 @@ MAIL_TEXT_PASSWORD_NEW ="Hello {name};;your new password: {password};;Please not MAIL_TEXT_REGISTER_COMMIT_CODE ="Hello,;;you (or another person) has requested a registration code.;;Your registration code: {code}.;;Please insert this number into the input field.;;Thank you." MAIL_TEXT_USER_MAIL = "Hello {name},;;Your account details for login in OpenRat Content Management System are the following.;;Login: {username};Password: {password};;Thank you." MAKE_DEFAULT = "set to default" +MENU_ACLFORM="Add right" MENU_ADD_DESC = "Add new" +MENU_ADDEL="New element" MENU_ADD = New +MENU_APPLICATIONS="Applications" +MENU_APPLICATIONS_DESC="Start more applications" +MENU_ARCHIVE="Archive" +MENU_ARCHIVE_DESC="Archive" +MENU_CHANGETEMPLATE="Change template" +MENU_CLIPBOARD="Clipboard" +MENU_COMPRESS ="Compress" +MENU_COMPRESS_DESC ="Compress file" +MENU_CONSOLE="Console" MENU_CONTENT =Content MENU_CONTENT_DESC = "Content" MENU_CREATE_DESC = "Create a new object in this directory" +MENU_CREATEFILE="Upload file" +MENU_CREATEFOLDER="New subfolder" MENU_CREATE_KEY = N +MENU_CREATELINK="New link" MENU_CREATE = New +MENU_CREATEPAGE="New page" +MENU_DELETE="Delete" MENU_EDIT_DESC = "Edit content" MENU_EDIT = Edit MENU_EDIT_KEY = B @@ -592,8 +635,15 @@ MENU_ELEMENT_REMOVE =Remove MENU_ELEMENT_TYPE_DESC =Change element-type MENU_ELEMENT_TYPE =Type MENU_EL_KEY = L +MENU_EXPORT_DESC = "Export in new database" +MENU_EXPORT = Export +MENU_EXTENSION="Enhancement" +MENU_EXTRACT_DESC = "Uncompress archive"n +MENU_EXTRACT = "Umcompress" MENU_FILE_ACLFORM =Add MENU_FILE_ACLFORM_DESC =Add a right to this file +MENU_FILEBROWSER_BROWSE_DESC="Show folder" +MENU_FILEBROWSER_BROWSE="Show" MENU_FILE_COMPRESS =Compress MENU_FILE_COMPRESS_DESC =Compress this file MENU_FILE_DECOMPRESS =Decompress @@ -611,6 +661,8 @@ MENU_FILE_PUB ="Publish" MENU_FILE_REMOVE =Remove file MENU_FILE_RIGHTS_DESC =Show rights of this file MENU_FILE_RIGHTS =Rights +MENU_FILE_SHOW_DESC ="Show file" +MENU_FILE_SHOW ="Preview" MENU_FILE_SHOWPROP_DESC =Show properties of this file MENU_FILE_SHOWPROP =Show MENU_FILE_SIZE_DESC =Change the image size @@ -664,6 +716,7 @@ MENU_GROUP_REMOVE ="Remove" MENU_GROUP_RIGHTS_DESC=View or edit the Rights of this group MENU_GROUP_RIGHTS=Rights MENU_GROUPS_DESC = "Add or remove groups" +MENU_GROUPS_KEY = G MENU_GROUPS = "Memberships" MENU_GROUP_USERS_DESC ="User in this group" MENU_GROUP_USERS ="Memberships" @@ -689,6 +742,8 @@ MENU_INDEX_REGISTER_DESC ="You must be a registered user to use this application MENU_INDEX_REGISTER ="Register now" MENU_INDEX_SHOWLOGIN_DESC ="You must login." MENU_INDEX_SHOWLOGIN =Login +MENU_INFO_DESC="Information" +MENU_INFO="Info" MENU_LANGUAGE_ADD =Add MENU_LANGUAGE_ADD_DESC = Add Language MENU_LANGUAGE_ADVANCED=Advanced @@ -699,10 +754,12 @@ MENU_LANGUAGE_LISTING_DESC =List all languages MENU_LANGUAGE_LISTING =List MENU_LANGUAGE_REMOVE_DESC = Remove language MENU_LANGUAGE_REMOVE =Remove +MENU_LICENSE="License" MENU_LINK_ACLFORM =Add right MENU_LINK_ACLFORM_DESC =Add a right to this link MENU_LINK_EDIT_DESC = "Edit target" MENU_LINK_EDIT =Edit target +MENU_LINK="Link" MENU_LINK_PROP_DESC = Edit properties of link MENU_LINK_PROP =Properties MENU_LINK_RIGHTS_DESC =Show all rights of this link @@ -712,6 +769,12 @@ MENU_LINK_SHOWPROP =View MENU_LISTING_DESC ="List" MENU_LISTING_KEY ="L" MENU_LISTING =List +MENU_LOGIN_DESC ="Login" +MENU_LOGIN ="Login" +MENU_LOGIN_LOGIN ="Login" +MENU_MAIL="E-Mail" +MENU_MAINTENANCE_DESC = "Check integration" +MENU_MAINTENANCE = "Maintenance" MENU_MEMBERSHIPS_DESC = "Edit the memberships in groups" MENU_MEMBERSHIPS = "Memberships" MENU_MODEL_ADD = "Add" @@ -722,6 +785,9 @@ MENU_MODEL_LISTING_DESC = Show a list of all project models MENU_MODEL_LISTING =List MENU_MODEL_REMOVE_DESC = "Remove model" MENU_MODEL_REMOVE = "Remove" +MENU_NAME="Name" +MENU_OPENID="Open-Id" +MENU_OTHER="Other" MENU_PAGE_ACLFORM =Add right MENU_PAGE_ACLFORM_DESC =Add a right to this page MENU_PAGE_CHANGETEMPLATE_DESC =Replace the template of this page @@ -756,12 +822,18 @@ MENU_PAGE_PUB_DESC ="Publish this page" MENU_PAGE_PUB ="Publish" MENU_PAGE_RIGHTS_DESC =See rights of this page MENU_PAGE_RIGHTS =Rights +MENU_PAGE_SHOW_DESC = "Show a preview of this page" +MENU_PAGE_SHOW = Preview MENU_PAGE_SHOWPROP_DESC =See the properties of this page MENU_PAGE_SHOWPROP =View +MENU_PAGES="Pages" MENU_PAGE_SRC_DESC = Show source MENU_PAGE_SRC = Source +MENU_PASSWORD_DESC ="Wenn Sie hier Kennwort nicht mehr wissen, können Sie es sich zusenden lassen." +MENU_PASSWORD ="Forgotten password" MENU_PHPINFO_DESC="Show some informations about the server system" MENU_PHPINFO = "System info" +MENU_PREVIEW="Preview" MENU_PROFILE_EDIT_DESC = "Edit your personal settings" MENU_PROFILE_EDIT = "Profile" MENU_PROFILE_GROUPS_DESC=Memberships in Groups @@ -785,8 +857,11 @@ MENU_PROJECT_LISTING_DESC =View all projects MENU_PROJECT_LISTING = "List" MENU_PROJECT_MAINTENANCE_DESC = "Maintenance" MENU_PROJECT_MAINTENANCE = "Maintenance" +MENU_PROJECTMENU ="Choose project" +MENU_PROJECTMENU_DESC ="Choose a project to work with" MENU_PROJECT_REMOVE_DESC = "Remove the project and all content" MENU_PROJECT_REMOVE = "Remove" +MENU_PROJECTTIMELINE="History" MENU_PROP_DESC = "Edit the Properties of this object" MENU_PROP_KEY = E MENU_PROP = Properties @@ -795,6 +870,9 @@ MENU_PUB_KEY = V MENU_PUB = "Publish" MENU_PW_DESC = "Change user password" MENU_PW = Password +MENU_REGISTER_DESC ="You must be registered to use this application." +MENU_REGISTER ="Register" +MENU_REMOVE="Delete" MENU_RIGHTS_DESC = "grant or revoke rights" MENU_RIGHTS_KEY = X MENU_RIGHTS = Rights @@ -803,12 +881,20 @@ MENU_SEARCH_CONTENT_DESC ="Search for a value" MENU_SEARCH_PROP_DESC = "Search for a property" MENU_SEARCH_PROP="Property" MENU_SEARCH_PROP = "Property" +MENU_SEARCH="Search" +MENU_SETTINGS_DESC = "Preferences" +MENU_SETTINGS_KEY = E +MENU_SETTINGS = "Preferences" MENU_SHOW_DESC = "Show the contents of this object" MENU_SHOW_KEY = "V" MENU_SHOW = "View" +MENU_SIZE_DESC = Change image size +MENU_SIZE = Image size MENU_SRC_DESC = "Show sourcecode of page" +MENU_SRCELEMENT="Add element" MENU_SRC_KEY = Q MENU_SRC = Source +MENU_STRUCTURE="Outline" MENU_TEMPLATE_ADD =Add MENU_TEMPLATE_ADD_DESC =Add a new template MENU_TEMPLATE_ADDEL =Add @@ -832,6 +918,7 @@ MENU_TEMPLATE_SRC_DESC =Edit the sourcecode MENU_TEMPLATE_SRCELEMENT =Add element MENU_TEMPLATE_SRCELEMENT_DESC =Add an element MENU_TEMPLATE_SRC =Source +MENU_TIMELINE="History" MENU_TITLE_ELEMENT_EDIT =Edit Element MENU_TITLE_FILE_EDIT ="Edit file" MENU_TITLE_FILE_PROP =Properties of file @@ -878,10 +965,17 @@ MENU_TITLE_USER_LISTING = List of users MENU_TITLE_USER_MEMBERSHIPS =Memberships MENU_TITLE_USER_PW = Change password MENU_TITLE_USER_RIGHTS = "Rights" +MENU_TREE_CONTENT="Values" +MENU_TREE_DESC=Navigation +MENU_TREE=Navigation +MENU_TREE_SETTINGS="Einstellungen" MENU_TREETITLE_ADMINISTRATION =Administration MENU_TREETITLE_ADMINISTRATION_DESC =System administration MENU_TREETITLE_PROJECTMENU_DESC =Select Project MENU_TREETITLE_PROJECTMENU =Projects +MENU_TYPE="Typ" +MENU_UNCOMPRESS =Decompress +MENU_UNCOMPRESS_DESC = "Umcompress the compressed file" MENU_USER_ADD =Add MENU_USER_ADD_DESC = "Add new user" MENU_USER_ADDGROUP =Add Group @@ -891,6 +985,7 @@ MENU_USER_GROUPS_DESC =Memberships MENU_USER_GROUPS = "Memberships" MENU_USER_LISTING_DESC =User list MENU_USER_LISTING =List +MENU_USERPROJECTTIMELINE="My changes" MENU_USER_PW_DESC = Change password MENU_USER_PW =Password MENU_USER_REMOVE_DESC = "Remove project" @@ -899,6 +994,7 @@ MENU_USER_RIGHTS_DESC="List all rights for this user" MENU_USER_RIGHTS="Rights" MENU_USERS_DESC = "Add or remove users" MENU_USERS = "Memberships" +MENU_USERTIMELINE="My changes" MODE_EDIT_CANCEL = "Cancel" MODE_EDIT_CANCEL_DESC = "Cancel input" MODE_EDIT_DESC = "Edit of data" @@ -924,6 +1020,7 @@ NOTICE_ERROR = "An error occured" NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="The user-group-relations my conflict with the directory service. Memberships were synchronized at login time." NOTICE_IMAGE_RESIZED = "The image was changed" NOTICE_IMAGE_RESIZING_NOT_AVAILABLE="Image resizing is not available at the moment, please ensure, that the GD library is installed." +NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." NOTICE_IMPORTED = "File was imported" NOTICE_INPUT_NEW_IMAGE_SIZE = "Please enter the new image size, either a size factor or widht and height." NOTICE_LINKED = "linked" @@ -951,10 +1048,12 @@ NOTICE_PUBLISHED_ERROR ="was not published." NOTICE_PUBLISHED ="was published" NOTICE_SAVED = "was saved" NOTICE_SEQUENCE_CHANGED = "The sequence was changed" +NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." NOTICE_USER_ADDED = "The user was added" NOTICE_USER_ADDED_TO_GROUP = "The memberships of this group are updated, {count} users were added." NOTICE_USER_ALREADY_IN_DATABASE = "The user is already there, please select another username." NOTICE_VALUE_SAVED = "Content was saved" +OPENID_NOT_ENABLED="Login with openid is disabled" OPENID="Open-ID" OPENID_USER="Open-ID Username" OPTIONS="Options" @@ -982,6 +1081,7 @@ PAGE_TEMPLATE_NEW = "New Template" PAGE_TEMPLATE_OLD = "Old Template" PASSWORD_CODE =Code for reqesting a new password PASSWORD_CODE_HELP ="You has received a code via e-mail. Please insert this code in this input field." +PASSWORD_NOT_ENABLED="Mailing a new password is disabled." PREFERENCES = Settings PROJECT_CHECK_FILES="Folder Integritycheck" PROJECT_CHECK_LIMIT="Remove old values from archives" @@ -1006,8 +1106,10 @@ PROJECT_LOCALPATH_DESC = "Local directory, format: <tt>/path/.../path/</tt>.<br/ PROJECTMODEL_DELETE_DESC = "Delete this Project model, all templates are lost!" PROJECT_NAME = "Project description" PROJECT_SELECT_DESC = "Work in an other project" +PROJECT_TARGET_DIR_DESC = "Target directory in the local filesystem. PROJECT_TARGET_DIR = "Target Directory" PROP_USERINFO = "User" +REGISTER_NOT_ENABLED = "The registration is disabled." SEARCH_CONTENT = "Search for Content" SEARCH_DESC="Searching in the project" SEARCH_PROP = "Search for Property" @@ -1018,6 +1120,7 @@ SESSION_EXPIRED="Your session has expired or your have insufficient rights for t SETTING_ALWAYS_EDIT = "If possible, open every form in edit mode" SETTING_IGNORE_OK_NOTICES = "Ignore OK-Dialogmessages" SETTING="Setting" +SRC="Sourcecode" START_DESC="Start" START = "Start" TEMPLATE_DELETE_DESC = "Delete the template with all elements in it" @@ -1092,6 +1195,7 @@ USER_MAIL_TEXT_PREFIX = "Your Password for logging in to OpenRat Content Managem USER_MAIL_TEXT_SUFFIX = "Note this password at a secure place and remove this E-Mail. Your are able to change your password after logging in." USER_MEMBERSHIPS = Memberships USER_NEW_MAIL = "New E-Mail address" +USER_NEW_PASSWORD_INPUT = "Input new password" USER_NEW_PASSWORD = "New Password" USER_NEW_PASSWORD_REPEAT = "New password again" USER_PASSWORD = "Password" @@ -1107,20 +1211,4 @@ USER_USERNAME = Username USER_YOURPROFILE = "My settings" VALUE = Content WEEK="Week" - -EL_LINKINFO_FILENAME = "Filename (without extension)" -EL_LINKINFO_FULL_FILENAME = "Complete filename with path" -EL_LINKINFO_ID = "ID of linked object" -EL_LINKINFO_NAME = "Name of linked object" -EL_LINKINFO_DESCRIPTION = "Description of linked object" - -EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" -EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" -EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" -EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" -EL_LINKDATE = "Link-Info-Date" -NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." -NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." -MENU_PREVIEW="Preview" -MENU_CLIPBOARD="Clipboard" -MENU_CONSOLE="Console" +WINDOW_FULLSCREEN="Fullscreen" diff --git a/language/es.ini.php b/language/es.ini.php @@ -3,6 +3,8 @@ ; Please send new translations to cmstrl@jandankert.de thanks. ; + + ACCESSKEY_MAIN_ADD="A" ACCESSKEY_MAIN_ADMINISTRATION=S ACCESSKEY_MAIN_CONTENT="C" @@ -222,6 +224,11 @@ EL_INSERT_INLINE="Internal Insert while publishing" EL_INSERT = "Insert" EL_INSERT_SSI="Insert via Serverside-Include (SSI)" EL_LINK = " Ancla " +EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" +EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" +EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" +EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" +EL_LINKDATE = "Link-Info-Date" EL_LINK_DESC = " Acoplamiento a una pgina o a un archivo " EL_LINK_FILE = "Link to files" EL_LINK_IMAGE_DATA_URI = "Link to images with Data-URI" @@ -232,14 +239,19 @@ EL_LINKINFO_CREATE_USER_FULLNAME = "Create-User: Full name" EL_LINKINFO_CREATE_USER_MAIL = "Create-User: E-Mail" EL_LINKINFO_CREATE_USER_TEL = "Create-User: Telephone Number" EL_LINKINFO_CREATE_USER_USERNAME = "Create-User: Username" +EL_LINKINFO_DESCRIPTION = "Description of linked object" EL_LINKINFO_DESC = "Use an Property out of a linked object" +EL_LINKINFO_FILENAME = "Filename (without extension)" +EL_LINKINFO_FULL_FILENAME = "Complete filename with path" EL_LINKINFO_HEIGHT = "Height" +EL_LINKINFO_ID = "ID of linked object" EL_LINKINFO_LASTCH_USER_DESC = "Last User: Description" EL_LINKINFO_LASTCH_USER_FULLNAME = "Last User: Full name" EL_LINKINFO_LASTCH_USER_MAIL = "Last User: E-Mail" EL_LINKINFO_LASTCH_USER_TEL = "Last User: Telephone number" EL_LINKINFO_LASTCH_USER_USERNAME = "Last User: Username" EL_LINKINFO_MIME-TYPE = "Mime-Type" +EL_LINKINFO_NAME = "Name of linked object" EL_LINKINFO_WIDTH = "Width" EL_LINK_LINK = "Link to anchors" EL_LINK_NONE = "All" @@ -940,6 +952,7 @@ NOTICE_ERROR = " un error " NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="The user-group-relations my conflict with the directory service. Memberships were synchronized at login time." NOTICE_IMAGE_RESIZED = " la imagen era " NOTICE_IMAGE_RESIZING_NOT_AVAILABLE="Image resizing is not available at the moment, please ensure, that the GD library is installed." +NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." NOTICE_IMPORTED = " archivo cambiante era ist ligado del '' del <em> del '' del username de la conexin failed.<br/><br/>The del importet " NOTICE_INPUT_NEW_IMAGE_SIZE = "Please enter the new image size, either a size factor or widht and height." NOTICE_LINKED = " " @@ -968,6 +981,7 @@ NOTICE_PUBLISHED_ERROR ="was not published." NOTICE_PUBLISHED = " fueron publicadas " NOTICE_SAVED = " fueron ahorradas " NOTICE_SEQUENCE_CHANGED = " la secuencia eran " +NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." NOTICE_USER_ADDED = " El usuario era " NOTICE_USER_ADDED_TO_GROUP = "The memberships of this group are updated, {count} users were added." NOTICE_USER_ALREADY_IN_DATABASE = "The user is already there, please select another username." @@ -1124,17 +1138,3 @@ USER_USERNAME_DESC = " con este nombre que el usuario est entrando " USER_YOURPROFILE = " mi contenido de los ajustes " VALUE = Content WEEK="Week" - -EL_LINKINFO_FILENAME = "Filename (without extension)" -EL_LINKINFO_FULL_FILENAME = "Complete filename with path" -EL_LINKINFO_ID = "ID of linked object" -EL_LINKINFO_NAME = "Name of linked object" -EL_LINKINFO_DESCRIPTION = "Description of linked object" - -EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" -EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" -EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" -EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" -EL_LINKDATE = "Link-Info-Date" -NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." -NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." diff --git a/language/fr.ini.php b/language/fr.ini.php @@ -2,6 +2,8 @@ ; <?php die( 'no access' ) ?> ; Please send new translations to cmstrl@jandankert.de thanks. ; + + ACCESSKEY_MAIN_ADD="A" ACCESSKEY_MAIN_ADMINISTRATION=S ACCESSKEY_MAIN_CONTENT="C" @@ -221,6 +223,11 @@ EL_INSERT_INLINE="Internal Insert while publishing" EL_INSERT = "Insert" EL_INSERT_SSI="Insert via Serverside-Include (SSI)" EL_LINK = "Ancre" +EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" +EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" +EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" +EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" +EL_LINKDATE = "Link-Info-Date" EL_LINK_DESC = "Lien une page ou un dossier" EL_LINK_FILE = "Link to files" EL_LINK_IMAGE_DATA_URI = "Link to images with Data-URI" @@ -231,14 +238,19 @@ EL_LINKINFO_CREATE_USER_FULLNAME = "Create-User: Full name" EL_LINKINFO_CREATE_USER_MAIL = "Create-User: E-Mail" EL_LINKINFO_CREATE_USER_TEL = "Create-User: Telephone Number" EL_LINKINFO_CREATE_USER_USERNAME = "Create-User: Username" +EL_LINKINFO_DESCRIPTION = "Description of linked object" EL_LINKINFO_DESC = "Use an Property out of a linked object" +EL_LINKINFO_FILENAME = "Filename (without extension)" +EL_LINKINFO_FULL_FILENAME = "Complete filename with path" EL_LINKINFO_HEIGHT = "Height" +EL_LINKINFO_ID = "ID of linked object" EL_LINKINFO_LASTCH_USER_DESC = "Last User: Description" EL_LINKINFO_LASTCH_USER_FULLNAME = "Last User: Full name" EL_LINKINFO_LASTCH_USER_MAIL = "Last User: E-Mail" EL_LINKINFO_LASTCH_USER_TEL = "Last User: Telephone number" EL_LINKINFO_LASTCH_USER_USERNAME = "Last User: Username" EL_LINKINFO_MIME-TYPE = "Mime-Type" +EL_LINKINFO_NAME = "Name of linked object" EL_LINKINFO_WIDTH = "Width" EL_LINK_LINK = "Link to anchors" EL_LINK_NONE = "All" @@ -939,6 +951,7 @@ NOTICE_ERROR = "Une erreur s'est produite" NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="The user-group-relations my conflict with the directory service. Memberships were synchronized at login time." NOTICE_IMAGE_RESIZED = "L'image a t change" NOTICE_IMAGE_RESIZING_NOT_AVAILABLE="Image resizing is not available at the moment, please ensure, that the GD library is installed." +NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." NOTICE_IMPORTED = "Le dossier tait l'importet" NOTICE_INPUT_NEW_IMAGE_SIZE = "Please enter the new image size, either a size factor or widht and height." NOTICE_LINKED = "li" @@ -967,6 +980,7 @@ NOTICE_PUBLISHED = "a t dit" NOTICE_PUBLISHED_ERROR ="was not published." NOTICE_SAVED = "a t conomis" NOTICE_SEQUENCE_CHANGED = "L'ordre a t chang" +NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." NOTICE_USER_ADDED = "L'utilisateur a t ajout" NOTICE_USER_ADDED_TO_GROUP = "The memberships of this group are updated, {count} users were added." NOTICE_USER_ALREADY_IN_DATABASE = "The user is already there, please select another username." @@ -1123,17 +1137,3 @@ USER_USERNAME = "Username" USER_YOURPROFILE = "Mes arrangements" VALUE = Content WEEK="Week" - -EL_LINKINFO_FILENAME = "Filename (without extension)" -EL_LINKINFO_FULL_FILENAME = "Complete filename with path" -EL_LINKINFO_ID = "ID of linked object" -EL_LINKINFO_NAME = "Name of linked object" -EL_LINKINFO_DESCRIPTION = "Description of linked object" - -EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" -EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" -EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" -EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" -EL_LINKDATE = "Link-Info-Date" -NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." -NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." diff --git a/language/it.ini.php b/language/it.ini.php @@ -2,6 +2,8 @@ ; <?php die( 'no access' ) ?> ; Please send new translations to cmstrl@jandankert.de thanks. ; + + ACCESSKEY_MAIN_ADD="A" ACCESSKEY_MAIN_ADMINISTRATION=S ACCESSKEY_MAIN_CONTENT="C" @@ -220,6 +222,11 @@ EL_INSERT_DESC = "Inserting page(s). Either 1 selected page or a list of pages o EL_INSERT_INLINE="Internal Insert while publishing" EL_INSERT = "Insert" EL_INSERT_SSI="Insert via Serverside-Include (SSI)" +EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" +EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" +EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" +EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" +EL_LINKDATE = "Link-Info-Date" EL_LINK_DESC = "ad una pagina o ad una lista della lima" EL_LINK_FILE = "Link to files" EL_LINK = "il collegamento dell'ancoraggio" @@ -231,14 +238,19 @@ EL_LINKINFO_CREATE_USER_FULLNAME = "Create-User: Full name" EL_LINKINFO_CREATE_USER_MAIL = "Create-User: E-Mail" EL_LINKINFO_CREATE_USER_TEL = "Create-User: Telephone Number" EL_LINKINFO_CREATE_USER_USERNAME = "Create-User: Username" +EL_LINKINFO_DESCRIPTION = "Description of linked object" EL_LINKINFO_DESC = "Use an Property out of a linked object" +EL_LINKINFO_FILENAME = "Filename (without extension)" +EL_LINKINFO_FULL_FILENAME = "Complete filename with path" EL_LINKINFO_HEIGHT = "Height" +EL_LINKINFO_ID = "ID of linked object" EL_LINKINFO_LASTCH_USER_DESC = "Last User: Description" EL_LINKINFO_LASTCH_USER_FULLNAME = "Last User: Full name" EL_LINKINFO_LASTCH_USER_MAIL = "Last User: E-Mail" EL_LINKINFO_LASTCH_USER_TEL = "Last User: Telephone number" EL_LINKINFO_LASTCH_USER_USERNAME = "Last User: Username" EL_LINKINFO_MIME-TYPE = "Mime-Type" +EL_LINKINFO_NAME = "Name of linked object" EL_LINKINFO_WIDTH = "Width" EL_LINK_LINK = "Link to anchors" EL_LINK_NONE = "All" @@ -939,6 +951,7 @@ NOTICE_ERROR = "un errore ha accaduto" NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="The user-group-relations my conflict with the directory service. Memberships were synchronized at login time." NOTICE_IMAGE_RESIZED = "l'immagine era" NOTICE_IMAGE_RESIZING_NOT_AVAILABLE="Image resizing is not available at the moment, please ensure, that the GD library is installed." +NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." NOTICE_IMPORTED = "lima cambiata era ist collegato del '' del <em> del '' del username di inizio attivit failed.<br/><br/>The del importet" NOTICE_INPUT_NEW_IMAGE_SIZE = "Please enter the new image size, either a size factor or widht and height." NOTICE_LINKED = "" @@ -967,6 +980,7 @@ NOTICE_PUBLISHED_ERROR ="was not published." NOTICE_PUBLISHED = "sono state pubblicate" NOTICE_SAVED = "sono state risparmiate" NOTICE_SEQUENCE_CHANGED = "la sequenza erano" +NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." NOTICE_USER_ADDED = "L'utente era" NOTICE_USER_ADDED_TO_GROUP = "The memberships of this group are updated, {count} users were added." NOTICE_USER_ALREADY_IN_DATABASE = "The user is already there, please select another username." @@ -1123,17 +1137,3 @@ USER_USERNAME = "Username" USER_YOURPROFILE = "il mio soddisfare delle regolazioni" VALUE = Content WEEK="Week" - -EL_LINKINFO_FILENAME = "Filename (without extension)" -EL_LINKINFO_FULL_FILENAME = "Complete filename with path" -EL_LINKINFO_ID = "ID of linked object" -EL_LINKINFO_NAME = "Name of linked object" -EL_LINKINFO_DESCRIPTION = "Description of linked object" - -EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" -EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" -EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" -EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" -EL_LINKDATE = "Link-Info-Date" -NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." -NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." diff --git a/language/ru.ini.php b/language/ru.ini.php @@ -2,6 +2,8 @@ ; <?php die( 'no access' ) ?> ; Please send new translations to cmstrl@jandankert.de thanks. ; + + ACCESSKEY_MAIN_ADD="A" ACCESSKEY_MAIN_ADMINISTRATION="S" ACCESSKEY_MAIN_CONTENT="C" @@ -72,9 +74,8 @@ ACCESSKEY_WINDOW_SRC="S" ACCESSKEY_WINDOW_TYPE="T" ACCESSKEY_WINDOW_UNCOMPRESS="X" ACCESSKEY_WINDOW_USERS="R" -ACL = "Человека" -ACL_CREATE_FILE = "Загрузить файл" ACL_CREATE_FILE_ABBREV = "FIL" +ACL_CREATE_FILE = "Загрузить файл" ACL_CREATE_FOLDER_ABBREV = "DIR" ACL_CREATE_FOLDER = "FIL Создайте Каталог DIR" ACL_CREATE_LINK_ABBREV = "LNK" @@ -87,18 +88,19 @@ ACL_DESC = "ДЕЛЬ этого человека используются для ACL_GRANT_ABBREV = "GR" ACL_GRANT = "Грант человека GR" ACL_INHERITED = "inherited" -ACL_PROP = "унаследовала Редактировать Свойства ППВ" ACL_PROP_ABBREV = "PRP" +ACL_PROP = "унаследовала Редактировать Свойства ППВ" ACL_PUBLISH_ABBREV = "Опубликовать PUB Прочтите" ACL_PUBLISH = "Publish" ACL_READ_ABBREV = "REA" ACL_READ = "Read" -ACL_RELEASE = "РЕА содержанию выпуска" ACL_RELEASE_ABBREV = "REL" +ACL_RELEASE = "РЕА содержанию выпуска" ACL_TRANSMIT_ABBREV = "INH" ACL_TRANSMIT = "REL наследования прав печень" -ACL_WRITE = "Изменить содержимое ВИР" ACL_WRITE_ABBREV = "WRI" +ACL_WRITE = "Изменить содержимое ВИР" +ACL = "Человека" ADDITIONAL_INFO = "Дополнительная информация : Отменить" BUTTON_BACK = "Back" BUTTON_BACK_DESC = "Back" @@ -121,16 +123,15 @@ COMPRESSION_ZIP = "ZIP (PKZIP)" CONFIRM_DELETE = "Confirm Delete" CONTENT = "Value" CREATE_USER = "Creationuser" -DATE = "Дата" DATE_ANSI = "Дата ANSI счисления" DATE_FORMAT_LONG = "m/d Y, H:i" DATE_FORMAT = "м / д Y, H : я : ы" DATE_LAST_MONTH = "За последний месяц За последний" DATE_LAST_YEAR = "Last year" -DATE_MONTH1 = "года январь" DATE_MONTH10 = "October" DATE_MONTH11 = "октябрь ноябрь декабрь" DATE_MONTH12 = "December" +DATE_MONTH1 = "года январь" DATE_MONTH2 = "February" DATE_MONTH3 = "февраля марта апреля" DATE_MONTH4 = "April" @@ -150,6 +151,7 @@ DATE_WEEKDAY3 = "Wednesdy" DATE_WEEKDAY4 = "Среди Четверг Пятница" DATE_WEEKDAY5 = "Friday" DATE_WEEKDAY6 = "Saturday" +DATE = "Дата" DESCRIPTION = Description DOCUMENT_TREE = "Document tree" EDITOR_EDITLINK = "Edit Link" @@ -163,20 +165,20 @@ EL_CODE_DESC = "Кодекс Это <strong> PHP-код </strong> - элемен EL_CODE = "PHP Code" EL_COPY ="Copy" EL_COPY_DESC = "Copy a Value out of an element of a linked page" -EL_DATE = "Дата" EL_DATE_DESC = "Этот элемент содержит дату" +EL_DATE = "Дата" EL_DYNAMIC_DESC = "Динамическая Мощный динамичный элемент содержит динамические элементы сценариев, f.e. сложных навигационных меню. Инфо" EL_DYNAMIC = "Dynamic" -ELEMENT = "Суббота Элемент" ELEMENT_DELETE_DESC = "Элементы Удалить элемент. Внимание <strong> </strong>, все значения со основаны на этот элемент будут утеряны! Удалить" ELEMENT_DELETE_VALUES = "Delete Values" ELEMENT_DELETE_VALUES_DESC = "значения всех значений данного элемента будут удалены!" ELEMENT_DESC_DESC = "Эта характеристика показана при редактировании содержания это должно быть полезно для описания автора" -ELEMENT_NAME = "- имя элемента" ELEMENT_NAME_DESC = "Это имя identicates этот элемент в код шаблона. Вы можете изменить это имя позже Подтип" +ELEMENT_NAME = "- имя элемента" ELEMENTS = Elements ELEMENT_SUBTYPE = "Subtype" ELEMENT_TYPE = "Элемент типа PHP" +ELEMENT = "Суббота Элемент" EL_INFO_ACT_USER_DESC = "Входвыполненсиспользованием Пользователь : Описание" EL_INFO_ACT_USER_FULLNAME = "Входвыполненсиспользованием Пользователь : Ф.И.О." EL_INFO_ACT_USER_MAIL = "Входвыполненсиспользованием Пользователь : E-Mail" @@ -220,6 +222,11 @@ EL_INSERT_INLINE="Internal Insert while publishing" EL_INSERT = "Insert" EL_INSERT_SSI="Insert via Serverside-Include (SSI)" EL_LINK = "Anchor" +EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" +EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" +EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" +EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" +EL_LINKDATE = "Link-Info-Date" EL_LINK_DESC = "Энкор Ссылка на страницу или файл" EL_LINK_FILE = "Link to files" EL_LINK_IMAGE_DATA_URI = "Link to images with Data-URI" @@ -230,38 +237,43 @@ EL_LINKINFO_CREATE_USER_FULLNAME = "Create-User: Full name" EL_LINKINFO_CREATE_USER_MAIL = "Create-User: E-Mail" EL_LINKINFO_CREATE_USER_TEL = "Create-User: Telephone Number" EL_LINKINFO_CREATE_USER_USERNAME = "Create-User: Username" +EL_LINKINFO_DESCRIPTION = "Description of linked object" EL_LINKINFO_DESC = "Use an Property out of a linked object" +EL_LINKINFO_FILENAME = "Filename (without extension)" +EL_LINKINFO_FULL_FILENAME = "Complete filename with path" EL_LINKINFO_HEIGHT = "Height" +EL_LINKINFO_ID = "ID of linked object" EL_LINKINFO_LASTCH_USER_DESC = "Last User: Description" EL_LINKINFO_LASTCH_USER_FULLNAME = "Last User: Full name" EL_LINKINFO_LASTCH_USER_MAIL = "Last User: E-Mail" EL_LINKINFO_LASTCH_USER_TEL = "Last User: Telephone number" EL_LINKINFO_LASTCH_USER_USERNAME = "Last User: Username" EL_LINKINFO_MIME-TYPE = "Mime-Type" +EL_LINKINFO_NAME = "Name of linked object" EL_LINKINFO_WIDTH = "Width" EL_LINK_LINK = "Link to anchors" EL_LINK_NONE = "All" EL_LINK_PAGE = "Link to pages" EL_LIST_DESC = "Список Список элементов включает 1 или более страниц. С этим элементом вы можете поместить несколько страниц на одном вместе" EL_LIST = "List" -EL_LONGTEXT = "Да" EL_LONGTEXT_DESC = "текст долго тексты с более чем 1 линия" +EL_LONGTEXT = "Да" EL_NUMBER_DESC = "число Число элементов содержит числовые значения" EL_NUMBER = "Number" -EL_PROP_ALL_LANGUAGES = "Все языки" EL_PROP_ALL_LANGUAGES_DESC = "Содержание равно на всех языках PHP" +EL_PROP_ALL_LANGUAGES = "Все языки" EL_PROP_CODE_DESC = "Кодекс <em> Подсказка : </em> Посмотрите на API - Документация этого класса. Обязательно используйте только из методов этого класса, не повторить <tt> </tt> или распечатать <tt> </tt>!" EL_PROP_CODE = "PHP Code" -EL_PROP_DATEFORMAT = "Формат даты" EL_PROP_DATEFORMAT_DESC = "Формат даты. Расскажите своим администратором Вам нужны другие форматы <br> (Полезный совет : Это форматы, определены в файле <tt> dateformat.ini.php </tt>)" -EL_PROP_DECIMALS = "графом сотых" +EL_PROP_DATEFORMAT = "Формат даты" EL_PROP_DECIMALS_DESC = "графом сотых" -EL_PROP_DEC_POINT = "запятой Char" +EL_PROP_DECIMALS = "графом сотых" EL_PROP_DEC_POINT_DESC = "в десятичную точку, f.e. . 'или', 'или пустые" -EL_PROP_DEFAULT_FOLDEROBJECT = "Наивысший каталоге" +EL_PROP_DEC_POINT = "запятой Char" EL_PROP_DEFAULT_FOLDEROBJECT_DESC = "Связанный объект можно выбравшие из этой папки. Выберите список будет намного яснее с полезным установление здесь." -EL_PROP_DEFAULT_LONGTEXT = "Текст по умолчанию" +EL_PROP_DEFAULT_FOLDEROBJECT = "Наивысший каталоге" EL_PROP_DEFAULT_LONGTEXT_DESC = "Этот текст используется в том случае, если элемент является пустым по умолчанию" +EL_PROP_DEFAULT_LONGTEXT = "Текст по умолчанию" EL_PROP_DEFAULT_OBJECT = "Default object" EL_PROP_DEFAULT_OBJECT_DESC = "объект по умолчанию объект по умолчанию" EL_PROP_DEFAULT_TEXT = "Default text" @@ -276,36 +288,36 @@ EL_PROP_HTML = "Описание по HTML" EL_PROP_RAW = "Simple text" EL_PROP_SELECT_ITEMS_DESC = "Вот значения из пояснил автор имеет возможность выбрать ценности." EL_PROP_SELECT_ITEMS = "Selectbox умолчанию" -EL_PROP_THOUSAND_SEP = "Тысячелетний символ" EL_PROP_THOUSAND_SEP_DESC = "Дарстеллунг дер Tausender - Стелле мам Zeichenkette, z.B., ЛЕЕР oder" +EL_PROP_THOUSAND_SEP = "Тысячелетний символ" EL_PROP_WIKI_DESC = "Используйте вики quickformat" EL_PROP_WIKI = "<em> Wiki </em> Быстрое форматирование" EL_PROP_WIKIHTML = "Wiki-like Formatting, HTML is allowed" -EL_PROP_WITH_ICON = "изменить иконку с" EL_PROP_WITH_ICON_DESC = "В режим редактирования значок отображается до значения записи" +EL_PROP_WITH_ICON = "изменить иконку с" EL_PROP_WRITABLE_DESC = "Проверить это, это элемент значения могут быть изменены" EL_PROP_WRITABLE = "writable" EL_SELECT_DESC = "Selectbox Стоимость определяется автором из списка" EL_SELECT = "Selectbox" -EL_TEXT = "Текстовые области" EL_TEXT_DESC = "В textfield используется для одной строки текста до 255 букв Technischer" +EL_TEXT = "Текстовые области" EMPTY=Empty -ERROR_ACCESS_DENIED = "Фехлер В доступе отказано" ERROR_ACCESS_DENIED_DESC = "Вы не имеете достаточно прав для доступа к отдельным статьям." +ERROR_ACCESS_DENIED = "Фехлер В доступе отказано" ERROR_DESC = "Определенная погрешность occurered. Пожалуйста, информируйте администратора." ERROR_DESTDIR_NOT_WRITEABLE = "В каталоге локальный файл недоступен для записи." ERROR_FTP_CANNOT_CONNECT_TO_SERVER = "В FTP Server - нет." ERROR_FTP_CANNOT_LOGIN = "В Войти на FTP Server - провалилась." ERROR_FTP_CANNOT_PASV_OFF = "В FTP - Сервер unaible выключает пассивный режим." ERROR_FTP_CANNOT_PASV_ON = "В FTP - Сервер unaible выключает пассивный режим." -ERROR_FTP = "Ошибка при FTP - передача" ERROR_FTP_UNABLE_TO_CHDIR = "В FTP Server - нельзя выбрать директорию." +ERROR_FTP = "Ошибка при FTP - передача" ERROR_LOGIN_BROKEN_SSL_CERT = "Login was denied, because your SSL-certificat is invalid." ERROR_NO_PROJECT = "нет проекта имеется." ERROR_NOT_A_FOLDER = "Объекта не справочник" ERROR = "Technischer Fehler" -ERROR_USER_PW = "Пароль не может быть изменен" ERROR_USER_PW_DESC = "пароль не может быть изменен Экспорт" +ERROR_USER_PW = "Пароль не может быть изменен" EXAMPLE = "Example" EXPORT_DESC = "Использовать для экспорта копирования файлов на сервер Ингушетия" EXPORT = "Export" @@ -316,8 +328,8 @@ FILE_IMAGE_HEIGHT = "Height" FILE_IMAGE_JPEG_COMPRESSION = "Высота Качество JPEG" FILE_IMAGE_NEW_HEIGHT = "Новая высота" FILE_IMAGE_NEW_SIZE="New image size" -FILE_IMAGE_NEW_WIDTH = "Новая ширина климата" FILE_IMAGE_NEW_WIDTH_HEIGHT = "New Width and height" +FILE_IMAGE_NEW_WIDTH = "Новая ширина климата" FILE_IMAGE_RESIZE = "Change size" FILE_IMAGE_RESIZE_DESC ="Change the image size, give the new width and size in pixels<br/><em>Hint:</em> Input only width <strong>or</strong> Height for not touching the format. If you only want to change the format, leave both fields empty." FILE_IMAGE_SIZE_FACTOR="New size in relation" @@ -404,8 +416,8 @@ GLOBAL_FILE_TRANSFER = "File transfer" GLOBAL_FOLDER_DESC = "Справочник может содержать другие каталоги, Версия, файлы и ссылки." GLOBAL_FOLDER = "Directory" GLOBAL_FORMAT = "Format" -GLOBAL_FULL_FILENAME = "Формат файла Заполните" GLOBAL_FULL_FILENAME_DESC = "Full Filename, which is used while publishing" +GLOBAL_FULL_FILENAME = "Формат файла Заполните" GLOBAL_GPL = "В комплект поставки ничего НЕ ГАРАНТИРУЕТ. <br> Это бесплатное программное обеспечение, и вы вправе распространять его на определенных условиях." GLOBAL_GROUP = "Group" GLOBAL_GROUPS = "Группа группах" @@ -433,8 +445,8 @@ GLOBAL_MAKE_DEFAULT = "Комплект для стандартных" GLOBAL_MINUTE = Minute GLOBAL_MINUTES = "Минута минут" GLOBAL_MODEL = "Model" -GLOBAL_MODELS = "Типовые модели" GLOBAL_MODELS_DESC = "С моделями вы можете сделать больше мнений проекта f.e. HTML и WML - Образец. Месяц" +GLOBAL_MODELS = "Типовые модели" GLOBAL_MONTH = Month GLOBAL_MONTHS = Months GLOBAL_MOVE = "месяцев" @@ -446,8 +458,8 @@ GLOBAL_NO_ARCHIVE_DESC = "For this element is no archive available." GLOBAL_NO_ARCHIVE = "No archive" GLOBAL_NO_DESCRIPTION_AVAILABLE = "Теперь не описание недоступно : (" GLOBAL_NO_DIFFERENCES_FOUND = "Нет отличий" -GLOBAL_NOPUBLISH = "Новые публикации отсутствует" GLOBAL_NOPUBLISH_DESC = "Все издательские функции, дезактивируются в данный момент. Извещение" +GLOBAL_NOPUBLISH = "Новые публикации отсутствует" GLOBAL_NO_TEMPLATES_AVAILABLE_DESC = "<em> Подсказка : </em> Там нет шаблонов имеется." GLOBAL_NOT_FOUND = "не найден" GLOBAL_NOTICES ="Notice" @@ -455,8 +467,8 @@ GLOBAL_NOT_LOGGED_IN = "не вошли в систему" GLOBAL_NOW = "Now" GLOBAL_NR = "№" GLOBAL_OR = "или" -GLOBAL_OTHER = "Другие предметы" GLOBAL_OTHER_DESC = "передача файлов, поиск объектов страницу" +GLOBAL_OTHER = "Другие предметы" GLOBAL_PAGEELEMENT = "Page element" GLOBAL_PAGE = "Page" GLOBAL_PAGES ="Pages" @@ -468,10 +480,10 @@ GLOBAL_PROJECT = "Project" GLOBAL_PROJECTS = "Проект Проекты Свойства" GLOBAL_PROP = "Properties" GLOBAL_PUBLIC = "public" -GLOBAL_PUBLISH = "общественности" GLOBAL_PUBLISH_WITH_SUBDIRS = "опубликовать опубликовать в подкаталогах" -GLOBAL_READONLY = "Только для чтения" +GLOBAL_PUBLISH = "общественности" GLOBAL_READONLY_DESC = "режиме Система в режиме только для чтения. Вы не сможете сохранить любые данные! Обновить" +GLOBAL_READONLY = "Только для чтения" GLOBAL_REFRESH = "Refresh" GLOBAL_REGISTER_DESC = "Зарегистрироваться Вы можете зарегистрироваться сейчас. Освобождение" GLOBAL_REGISTER = "Register" @@ -498,19 +510,19 @@ GLOBAL_TEMPLATES_DESC = "Edit the templates" GLOBAL_TEMPLATES = "Templates" GLOBAL_TEMPLATE = "Template" GLOBAL_TIME = Time -GLOBAL_TO = "до" GLOBAL_TODAY = "Today" +GLOBAL_TO = "до" GLOBAL_TRANSFER = "Сегодня передача типа" GLOBAL_TYPE = Type GLOBAL_UNDO = "Undo" -GLOBAL_UNKNOWN = "Отменить неизвестных" GLOBAL_UNKNOWN_TEXT = "нет текста до" +GLOBAL_UNKNOWN = "Отменить неизвестных" GLOBAL_UPLOAD = Upload GLOBAL_UP = up -GLOBAL_USE = "Загрузить Используйте" GLOBAL_USE_DESC = "Use this value for editing." -GLOBAL_USER = "Пользователь" GLOBAL_USERS = "Пользователи" +GLOBAL_USER = "Пользователь" +GLOBAL_USE = "Загрузить Используйте" GLOBAL_VALUE = "Content" GLOBAL_WITH = "с" GLOBAL_YEARS = "Год Годы" @@ -537,21 +549,21 @@ LANGUAGE_ISOCODE = "ISO Code" LASTCHANGE_USER = "Last User" LAST_MONTH = "Кодекс последний месяц последний" LAST_YEAR = "Last Year" -LINK = "Год Ссылка Ссылка" LINK_TARGET ="Link target" LINK_URL = "год связаны URL" +LINK = "Год Ссылка Ссылка" LIST_ENTRY_EMPTY="Not selected" LOGIN_NOLOGIN_DESC = "Логин отключен в настоящий момент." LOGO_CHANGEMAIL = "E-Mail address change" LOGO_CHANGEMAIL_TEXT = "Your new E-Mail adress has to be committed. You will get an e-mail with a commit number in it. After entering this code your new address will be saved." -LOGO_CHANGEPASSWORD = "Смена пароля" LOGO_CHANGEPASSWORD_TEXT = "Изменить пароль" +LOGO_CHANGEPASSWORD = "Смена пароля" LOGO_LOGIN =Anmeldung LOGO_LOGIN_TEXT = "Anmeldung Чтобы войти, Вам нужно учетную запись пользователя. Пожалуйста, проверьте для самоклеящихся дело." -LOGO_PASSWORD = "Забыли пароль?" LOGO_PASSWORD_TEXT = "Если Вы забыли пароль, стесняйтесь просить новую." -LOGO_PROJECTMENU = "Выберите проект" +LOGO_PASSWORD = "Забыли пароль?" LOGO_PROJECTMENU_TEXT = "Пожалуйста, выберите проект. Регистрация" +LOGO_PROJECTMENU = "Выберите проект" LOGO_REGISTER =Registration LOGO_REGISTER_TEXT = "Если у вас нет учетной записи Затем стесняйтесь регистрироваться сейчас. Вам нужно E-Mail записи к которому регистрационный код, который будут направляться запросы." MAIL_CODE = "Confirmation code" @@ -580,17 +592,17 @@ MENU_EL_DESC = "Список всех элементов" MENU_EL = Elements MENU_ELEMENT_EDIT_DESC = Edit all properties of the element MENU_ELEMENT_EDIT = Edit element -MENU_ELEMENT_NAME = "Элементы Имя" MENU_ELEMENT_NAME_DESC = "Изменить имя элемента" +MENU_ELEMENT_NAME = "Элементы Имя" MENU_ELEMENT_PROPERTIES_DESC = "Свойства Свойства элемента" MENU_ELEMENT_PROPERTIES =Properties MENU_ELEMENT_REMOVE_DESC = "Удалить Удалить элемент" MENU_ELEMENT_REMOVE =Remove -MENU_ELEMENT_TYPE = "Вид" MENU_ELEMENT_TYPE_DESC = "Изменение типа элемента" +MENU_ELEMENT_TYPE = "Вид" MENU_EL_KEY = "L" -MENU_FILE_ACLFORM = "Добавить Право" MENU_FILE_ACLFORM_DESC = "Добавить права на этот файл" +MENU_FILE_ACLFORM = "Добавить Право" MENU_FILE_COMPRESS =Compress MENU_FILE_COMPRESS_DESC = "Сжатие сжать этот файл" MENU_FILE_DECOMPRESS =Decompress @@ -601,8 +613,8 @@ MENU_FILE_EDITVALUE_DESC =Edit value MENU_FILE_EDITVALUE =Edit value MENU_FILE_EXTRACT_DESC =Extract this archive MENU_FILE_EXTRACT =Extract -MENU_FILE_PROP = "Изменить свойства" MENU_FILE_PROP_DESC = "Изменить свойства этого файла" +MENU_FILE_PROP = "Изменить свойства" MENU_FILE_PUB_DESC = "Опубликовать Разместить файл" MENU_FILE_PUB ="Publish" MENU_FILE_REMOVE = "Удалите файл" @@ -616,15 +628,15 @@ MENU_FILE_UNCOMPRESS = "Decompress" MENU_FILE_UNCOMPRESS_DESC = "Decompress file" MENU_FILE_UPLOAD_DESC = "Загрузить Вместо этого существует файл" MENU_FILE_UPLOAD =Upload -MENU_FOLDER_ACLFORM = "Добавить Право" MENU_FOLDER_ACLFORM_DESC = "Добавить права на эту папку" +MENU_FOLDER_ACLFORM = "Добавить Право" MENU_FOLDER_CREATE_DESC=Create a directory, page, file oder anchor -MENU_FOLDER_CREATEFILE = "Новый файл" MENU_FOLDER_CREATEFILE_DESC = "Добавить новый файл Сервер" -MENU_FOLDER_CREATEFOLDER = "Новый папку" +MENU_FOLDER_CREATEFILE = "Новый файл" MENU_FOLDER_CREATEFOLDER_DESC = "Добавить новую подпапку в этой папке" -MENU_FOLDER_CREATELINK = "Новая ссылка" +MENU_FOLDER_CREATEFOLDER = "Новый папку" MENU_FOLDER_CREATELINK_DESC = "Добавить новую ссылку в этой папке новые" +MENU_FOLDER_CREATELINK = "Новая ссылка" MENU_FOLDER_CREATE=New MENU_FOLDER_CREATEPAGE_DESC = "страницу Создать новую страницу в этой папке" MENU_FOLDER_CREATEPAGE =New page @@ -641,10 +653,10 @@ MENU_FOLDER_RIGHTS_DESC = "Показать прав Выберите" MENU_FOLDER_RIGHTS =Rights MENU_FOLDER_SELECT_DESC = "выберите" MENU_FOLDER_SELECT ="Select" -MENU_FOLDER_SHOW = "содержимое Стоимость Смотреть" MENU_FOLDER_SHOW_DESC = "Показать содержимое каталога" MENU_FOLDER_SHOWPROP_DESC = "Показывать свойства" MENU_FOLDER_SHOWPROP =Show +MENU_FOLDER_SHOW = "содержимое Стоимость Смотреть" MENU_FORM_DESC = "Форма Форма для всех элементов F" MENU_FORM = Form MENU_FORM_KEY = F @@ -654,8 +666,8 @@ MENU_GROUP_ADDUSER ="Add" MENU_GROUP_ADDUSER_DESC = "Добавить Добавить новых пользователей в эту группу" MENU_GROUP_EDIT_DESC = "Редактировать Редактировать название этой группы" MENU_GROUP_EDIT ="Edit" -MENU_GROUP_LISTING = "всех групп" MENU_GROUP_LISTING_DESC = "Показать все группы" +MENU_GROUP_LISTING = "всех групп" MENU_GROUP_REMOVE_DESC = "Удалить Удалить группу" MENU_GROUP_REMOVE ="Remove" MENU_GROUP_RIGHTS_DESC=View or edit the Rights of this group @@ -672,8 +684,8 @@ MENU_INDEX_ADMINISTRATION ="Administration" MENU_INDEX_ADMINISTRATION_DESC = "Управление проектами, пользователей и групп " MENU_INDEX_APPLICATIONS="Applications" MENU_INDEX_APPLICATIONS_DESC="Start other Applications" -MENU_INDEX_CHANGEPASSWORD = "Смена пароля" MENU_INDEX_CHANGEPASSWORD_DESC = "Изменить пароль Войти" +MENU_INDEX_CHANGEPASSWORD = "Смена пароля" MENU_INDEX_LOGIN =Login MENU_INDEX_LOGOUT_DESC = "Выход Выход из этой заявки." MENU_INDEX_LOGOUT ="Logout" @@ -690,20 +702,20 @@ MENU_LANGUAGE_ADD =Add MENU_LANGUAGE_ADD_DESC = Add Language MENU_LANGUAGE_ADVANCED_DESC=Edit the properties of this language MENU_LANGUAGE_ADVANCED=Enhanced -MENU_LANGUAGE_EDIT = "Добавить Редактировать список" MENU_LANGUAGE_EDIT_DESC = Edit language +MENU_LANGUAGE_EDIT = "Добавить Редактировать список" MENU_LANGUAGE_LISTING_DESC =List all languages MENU_LANGUAGE_LISTING =List MENU_LANGUAGE_REMOVE_DESC = Remove language MENU_LANGUAGE_REMOVE =Remove -MENU_LINK_ACLFORM = "Добавить Право" MENU_LINK_ACLFORM_DESC = "Добавить Право на ссылке" -MENU_LINK_EDIT = "Изменить год" +MENU_LINK_ACLFORM = "Добавить Право" MENU_LINK_EDIT_DESC = "Edit target" +MENU_LINK_EDIT = "Изменить год" MENU_LINK_PROP_DESC = Edit properties of link MENU_LINK_PROP =Properties -MENU_LINK_RIGHTS = "Свойства человека" MENU_LINK_RIGHTS_DESC = "Показать все права на эту ссылку Смотреть" +MENU_LINK_RIGHTS = "Свойства человека" MENU_LINK_SHOWPROP_DESC = Show properties of link MENU_LINK_SHOWPROP =View MENU_LISTING_DESC = "Список Список" @@ -711,16 +723,16 @@ MENU_LISTING_KEY = "L" MENU_LISTING =List MENU_MEMBERSHIPS_DESC = "Edit the memberships in groups" MENU_MEMBERSHIPS = "Memberships" -MENU_MODEL_ADD = "Удалить Добавить Редактировать" MENU_MODEL_ADD_DESC = Add model +MENU_MODEL_ADD = "Удалить Добавить Редактировать" MENU_MODEL_EDIT_DESC = Edit MENU_MODEL_EDIT =Edit MENU_MODEL_LISTING_DESC = Show list of all project models MENU_MODEL_LISTING =List -MENU_MODEL_REMOVE = "Список Удалить" MENU_MODEL_REMOVE_DESC = "Remove model" -MENU_PAGE_ACLFORM = "Добавить Право" +MENU_MODEL_REMOVE = "Список Удалить" MENU_PAGE_ACLFORM_DESC = "Добавить права на эту страницу Заменить" +MENU_PAGE_ACLFORM = "Добавить Право" MENU_PAGE_CHANGETEMPLATE_DESC = "шаблоне заменить шаблон на этой странице Редактировать" MENU_PAGE_CHANGETEMPLATE =Replace the template MENU_PAGE_EL_DESC = "Показать все элементы этой странице Редактировать" @@ -749,12 +761,12 @@ MENU_PAGEELEMENT_LINK="Link" MENU_PAGEELEMENT_LINK = "Link" MENU_PAGEELEMENT_PROP_DESC="Properties" MENU_PAGEELEMENT_PROP="Properties" -MENU_PAGE_ELEMENTS = "всем элементам страницы" MENU_PAGEELEMENT_SHOW_DESC=View text value MENU_PAGEELEMENT_SHOW_DESC =View text value MENU_PAGEELEMENT_SHOWLONGTEXT_DESC = View text content MENU_PAGEELEMENT_SHOW=View MENU_PAGEELEMENT_SHOW =View +MENU_PAGE_ELEMENTS = "всем элементам страницы" MENU_PAGE_FORM_DESC = "Редактировать все элементы страницы в одну анкету" MENU_PAGE_FORM =Edit MENU_PAGE_PROP_DESC = "Свойства Редактировать свойства страницы" @@ -775,8 +787,8 @@ MENU_PROFILE_GROUPS_DESC=Memberships in Groups MENU_PROFILE_GROUPS=Groups MENU_PROFILE_MAIL_DESC = "Change E-Mail" MENU_PROFILE_MAIL = "E-Mail" -MENU_PROFILE_PWCHANGE = "Смена пароля" MENU_PROFILE_PWCHANGE_DESC = "Изменить пароль" +MENU_PROFILE_PWCHANGE = "Смена пароля" MENU_PROFILE_SETTINGS_DESC = "Edit your user settings" MENU_PROFILE_SETTINGS = "Settings" MENU_PROJECT_ADD_DESC = "Новые Добавить новый проект" @@ -787,13 +799,13 @@ MENU_PROJECT_EXPORT_DESC = "Export" MENU_PROJECT_EXPORT = Export MENU_PROJECT_INFO_DESC="Show advanced project informations" MENU_PROJECT_INFO="Info" -MENU_PROJECT_LIST = "Все проекты" -MENU_PROJECT_LISTING = "Показать все" MENU_PROJECT_LISTING_DESC = "Просмотр подозрений проектов" -MENU_PROJECT_MAINTENANCE = "Обслуживание" +MENU_PROJECT_LISTING = "Показать все" +MENU_PROJECT_LIST = "Все проекты" MENU_PROJECT_MAINTENANCE_DESC = "Maintenance" -MENU_PROJECT_REMOVE = "Удалить" +MENU_PROJECT_MAINTENANCE = "Обслуживание" MENU_PROJECT_REMOVE_DESC = "проект Удалить проект, все содержание свойства" +MENU_PROJECT_REMOVE = "Удалить" MENU_PROP_DESC = "Изменить свойства этого объекта E" MENU_PROP_KEY = E MENU_PROP = Properties @@ -817,18 +829,18 @@ MENU_SHOW = Show MENU_SRC_DESC = "Источник Показать исходного кода страницы" MENU_SRC_KEY = "Q" MENU_SRC = Source -MENU_TEMPLATE_ADD = "Добавить" MENU_TEMPLATE_ADD_DESC = "Добавить новый шаблон" MENU_TEMPLATE_ADDEL =Add MENU_TEMPLATE_ADDEL_DESC = "Добавить Добавить элемент" -MENU_TEMPLATE_EDIT = "Редактировать Редактировать" +MENU_TEMPLATE_ADD = "Добавить" MENU_TEMPLATE_EDIT_DESC =Edit +MENU_TEMPLATE_EDIT = "Редактировать Редактировать" MENU_TEMPLATE_EL_DESC = "Элементы Все Елементе из шаблона" MENU_TEMPLATE_EL =Elements MENU_TEMPLATE_EXTENSION_DESC = "Продление Редактировать продлении" MENU_TEMPLATE_EXTENSION =Extension -MENU_TEMPLATE_LISTING = "Все шаблоны" MENU_TEMPLATE_LISTING_DESC = "Просмотр всех Шаблоны" +MENU_TEMPLATE_LISTING = "Все шаблоны" MENU_TEMPLATE_NAME_DESC = "Имя Редактировать название шаблона" MENU_TEMPLATE_NAME =Name MENU_TEMPLATE_PAGES_DESC=Related pages @@ -837,8 +849,8 @@ MENU_TEMPLATE_PROP = "Изменить свойства" MENU_TEMPLATE_REMOVE =Delete MENU_TEMPLATE_REMOVE_DESC = "Удалить Удалить шаблон Sourcecode" MENU_TEMPLATE_SRC_DESC = "Редактировать исходного Администрации" -MENU_TEMPLATE_SRCELEMENT = "Добавить элемент" MENU_TEMPLATE_SRCELEMENT_DESC = "Добавить элемент" +MENU_TEMPLATE_SRCELEMENT = "Добавить элемент" MENU_TEMPLATE_SRC =Sourcecode MENU_TITLE_ELEMENT_EDIT =Edit Element MENU_TITLE_FILE_EDIT ="Edit file" @@ -896,8 +908,8 @@ MENU_TREETITLE_PROJECTMENU =Projects MENU_USER_ADD =Add MENU_USER_ADD_DESC = "Add new user" MENU_USER_ADDGROUP = "Добавить" -MENU_USER_EDIT = "Группы пользователей данных" MENU_USER_EDIT_DESC = "User profile" +MENU_USER_EDIT = "Группы пользователей данных" MENU_USER_GROUPS_DESC =Memberships MENU_USER_GROUPS =Memeberships MENU_USER_LISTING_DESC =User list @@ -938,18 +950,19 @@ NOTICE_ERROR = "Произошла ошибка" NOTICE_GROUPS_MAY_CONFLICT_WITH_LDAP="The user-group-relations my conflict with the directory service. Memberships were synchronized at login time." NOTICE_IMAGE_RESIZED = "Изображение было изменено" NOTICE_IMAGE_RESIZING_NOT_AVAILABLE="Image resizing is not available at the moment, please ensure, that the GD library is installed." +NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." NOTICE_IMPORTED = "Файл был importet" NOTICE_INPUT_NEW_IMAGE_SIZE = "Please enter the new image size, either a size factor or widht and height." NOTICE_LINKED ="linked" -NOTICE_LOGIN_FAILED = "связаны Войти провалилась. <br> <br> В''имя пользователя название <em> () </em>''агрессивным отсутствует или неверный пароль." NOTICE_LOGIN_FAILED_MUSTCHANGEPASSWORD = "В Логин было отказано, б Ввиду пароль по таймауту. Попробуйте авторизоваться еще раз, б Хизб Теперь вместе с новым паролем." +NOTICE_LOGIN_FAILED = "связаны Войти провалилась. <br> <br> В''имя пользователя название <em> () </em>''агрессивным отсутствует или неверный пароль." NOTICE_LOGIN_OK = "Hello {name}, you are signed in." NOTICE_LOGIN_OPENID_FAILED="The login for {name} at Open-ID-Server failed." NOTICE_MAIL_NOT_SENT = "The mail could not be sent." NOTICE_MAIL_SENT = "Это сообщение было отправлено." NOTICE_MAX_FILE_SIZE_EXCEEDED="The maximum filesize is exceeded" -NOTICE_MOVED = "Был переведен" NOTICE_MOVED = "был переведен" +NOTICE_MOVED = "Был переведен" NOTICE_MUCH_TIME = "This action may take some time. Do not cancel loading of this page." NOTICE_NO_DATABASE_CONFIGURATION="No configured database connection" NOTICE_NO_PROJECTS_AVAILABLE ="There is no project available." @@ -962,12 +975,13 @@ NOTICE_PASSWORD_MINLENGTH = "the password is too short. The password must have a NOTICE_PASSWORDS_DO_NOT_MATCH = "The passwords do not match." NOTICE_PASSWORD_TIMEOUT = "Ваш пароль по таймауту, и должны быть изменены. Свойства" NOTICE_PROP_SAVED = "Properties saved" -NOTICE_PUBLISHED = "спасти было опубликовано" NOTICE_PUBLISHED_ERROR ="was not published." +NOTICE_PUBLISHED = "спасти было опубликовано" NOTICE_SAVED = "спас" NOTICE_SEQUENCE_CHANGED = "Последовательность изменения содержимого" -NOTICE_USER_ADDED = "Пользователь был добавлен" +NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." NOTICE_USER_ADDED_TO_GROUP = "The memberships of this group are updated, {count} users were added." +NOTICE_USER_ADDED = "Пользователь был добавлен" NOTICE_USER_ALREADY_IN_DATABASE = "The user is already there, please select another username." NOTICE_VALUE_SAVED = "спас" OPENID="Open-ID" @@ -986,12 +1000,12 @@ PAGE_ELEMENT_NAME = "Название элемента Содержание" PAGE_ELEMENTS_DESC = "Таблица Выберите элемент для редактирования" PAGE_ELEMENT_VALUE = "Content" PAGE_LONGTEXT_WIKI_DESC = "" -PAGE_PAGEELEMENT = "Элемент Page" PAGE_PAGEELEMENTS = "Page elements" +PAGE_PAGEELEMENT = "Элемент Page" PAGE_PREVIEW = "элементов предварительного просмотра (не сохранять)" PAGE_PUBLISH_AFTER_SAVE = "После спасения опубликовать страницу" -PAGE_REPLACE_TEMPLATE = "Заменить шаблон" PAGE_REPLACE_TEMPLATE_DESC = "заменить шаблон. Содержание может быть скопирован в следующем окне." +PAGE_REPLACE_TEMPLATE = "Заменить шаблон" PAGE_SOURCE = "Sourcecode страницы настроек" PAGE_TEMPLATE_NEW = "New Template" PAGE_TEMPLATE_OLD = "Old Template" @@ -1079,8 +1093,8 @@ TEXT_OL = "пронумерованы Список Таблица" TEXT_TABLE = "Table" TEXT_UL = "List" TIMEZONE="Timezone" -TRANSFER_IMPORT = "Список Импорт" TRANSFER_IMPORT_DESC = "Использование импорта вы можете импортировать файлы из файловой системы сервера. Источник" +TRANSFER_IMPORT = "Список Импорт" TRANSFER_SOURCE = "Source" TRANSFER_TARGET = "Цель" TREE_CHOOSE_PROJECT = "Пожалуйста, выберите проект." @@ -1122,17 +1136,3 @@ USER_USERNAME = "Username" USER_YOURPROFILE = "Мои настройки Содержимое" VALUE = "Content" WEEK="Week" - -EL_LINKINFO_FILENAME = "Filename (without extension)" -EL_LINKINFO_FULL_FILENAME = "Complete filename with path" -EL_LINKINFO_ID = "ID of linked object" -EL_LINKINFO_NAME = "Name of linked object" -EL_LINKINFO_DESCRIPTION = "Description of linked object" - -EL_LINKDATE_DATE_CREATED = "Linked object: Creation-Date/Time" -EL_LINKDATE_DATE_PUBLISHED = "Linked object: Date/Time of last publishing" -EL_LINKDATE_DATE_SAVED = "Linked object: Date/Time of last save" -EL_LINKDATE_DESC = "The Link-Info-Date is a date of a linked object" -EL_LINKDATE = "Link-Info-Date" -NOTICE_IMAGE_RESIZING_UNKNOWN_TYPE="This image type is not supported." -NOTICE_UNEXPECTED_CHARS = "The input data contains unexpected chars which were removed." diff --git a/model/Page.class.php b/model/Page.class.php @@ -175,6 +175,9 @@ class Page extends Object return ''; $param = array('oid'=>'__OID__'.$objectid.'__'); + + if ( $this->icons ) + $param['withIcons'] = '1'; $object = new Object( $objectid ); $object->objectLoad(); diff --git a/model/Value.class.php b/model/Value.class.php @@ -525,7 +525,8 @@ SQL $this->load(); $inhalt = ''; - + $raw = false; + global $conf; if ( $conf['cache']['enable_cache'] && is_file( $this->tmpfile() )) @@ -1288,7 +1289,6 @@ SQL if ( $this->page->simple ) break; - $raw = false; switch( $this->element->subtype ) { case 'db_id': @@ -1436,16 +1436,6 @@ SQL // Keine Fehlermeldung in erzeugte Seite schreiben. } - if ( !$raw && $this->page->mimeType()=='text/html' ) - $inhalt = Text::encodeHtml( $inhalt ); - - // Wenn HTML-Ausgabe, dann Sonderzeichen in HTML �bersetzen - if ( $this->page->mimeType()=='text/html' ) - $inhalt = Text::encodeHtmlSpecialChars( $inhalt ); - //Html::debug($inhalt); - //$inhalt = htmlspecialchars($inhalt,ENT_NOQUOTES,'UTF-8'); - $inhalt = translateutf8tohtml($inhalt); - break; default: @@ -1454,7 +1444,24 @@ SQL 'unknown type:'.$this->element->type); } + + switch( $this->element->type ) + { + case 'longtext': + case 'text': + case 'select': + + if ( $conf['publish']['encode_utf8_in_html'] ) + // Wenn HTML-Ausgabe, dann UTF-8-Zeichen als HTML-Code uebersetzen + if ( $this->page->mimeType()=='text/html' ) + $inhalt = translateutf8tohtml($inhalt); + break; + + default: + } + + if ( $this->page->icons && $this->element->withIcon ) $inhalt = '<a href="javascript:parent.openNewAction(\''.$this->element->name.'\',\'pageelement\',\''.$this->page->objectid.'_'.$this->element->elementid.'\');" title="'.$this->element->desc.'"><img src="'.OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/images/icon_el_'.$this->element->type.IMG_ICON_EXT.'" border="0" align="left"></a>'.$inhalt; diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php @@ -524,7 +524,6 @@ textarea.longtext font-family:Arial; font-size:13px; width:100%; - height:300px; border:1px solid <?php echo $_GET['text_color']; ?>; } @@ -626,7 +625,6 @@ table.calendar td textarea.editor { width:100%; - height:400px; } label, @@ -720,7 +718,8 @@ ul.tree ul div.entry.selected, div.dropdown > div.entry:hover, -div.dropdown > div.entry:hover > a +div.dropdown > div.entry:hover > a, +a.element { /*border:1px solid <?php echo $_GET['text_color']; ?>;*/ background-color:<?php echo $_GET['title_background_color']; ?>; @@ -1404,13 +1403,14 @@ body -form div.line +/* Formulare breit */ +div.bar.wide form div.line { clear:left; margin-top:10px; } -form div.label +div.bar.wide form div.label { display:inline-block; width:30%; @@ -1418,7 +1418,7 @@ form div.label text-align: right; } -form div.input +div.bar.wide form div.input { display:inline-block; width:60%; @@ -1426,6 +1426,31 @@ form div.input text-align: left; } +/* Formulare schmal */ +div.bar.small form div.line +{ + clear:left; + padding:10px; +} + +div.bar.small form div.label +{ + display:block; + width:100%; + vertical-align:top; + text-align: left; +} + +div.bar.small form div.input +{ + display:block; + width:100%; + vertical-align:top; + text-align: left; +} + + + form div.label > label, form div.input > div.intputholder { diff --git a/themes/default/include/html/inputarea.inc.php b/themes/default/include/html/inputarea.inc.php @@ -1 +1 @@ -<div class="inputholder"><textarea class="<?php echo $attr_class ?>" name="<?php echo $attr_name ?>" rows="<?php echo $attr_rows ?>" cols="<?php echo $attr_cols ?>"><?php echo htmlentities(isset($$attr_name)?$$attr_name:$attr_default) ?></textarea></div>- \ No newline at end of file +<div class="inputholder"><textarea class="<?php echo $attr_class ?>" name="<?php echo $attr_name ?>" ><?php echo Text::encodeHtml(isset($$attr_name)?$$attr_name:$attr_default) ?></textarea></div>+ \ No newline at end of file diff --git a/themes/default/include/html/label.inc.php b/themes/default/include/html/label.inc.php @@ -1,2 +1,2 @@ -<label<?php if (isset($attr_for)) { ?> for="id_<?php echo $attr_for ?><?php if (!empty($attr_value)) echo '_'.$attr_value ?>" class="label"<?php } ?>> -<?php if (isset($attr_key)) { echo lang($attr_key); if(hasLang($attr_key.'_desc')) { ?><div class="description"><?php echo lang($attr_key.'_desc')?></div> <?php } ?><?php if (isset($attr_text)) { echo $attr_text; } ?><?php } ?>- \ No newline at end of file +<label<?php if (isset($attr_for)) { ?> for="id_<?php echo $attr_for ?><?php if (!empty($attr_value)) echo '_'.$attr_value ?>" <?php if(hasLang(@$attr_key.'_desc')) { ?> title="<?php echo lang(@$attr_key.'_desc')?>"<?php } ?> class="label"<?php } ?>> +<?php if (isset($attr_key)) { echo lang($attr_key); ?><?php if (isset($attr_text)) { echo $attr_text; } ?><?php } ?>+ \ No newline at end of file diff --git a/themes/default/include/html/link.inc.php b/themes/default/include/html/link.inc.php @@ -35,7 +35,7 @@ #END-IF //$tmp_url = Html::url($attr_action,$attr_subaction,!empty($attr_id)?$attr_id:$this->getRequestId(),$params); - + $tmp_href = 'javascript:void(0);'; switch( $attr_type ) { case 'post': @@ -45,9 +45,13 @@ +$params ); $tmp_data = str_replace("\n",'',str_replace('"','&quot;',$tmp_data)); break; + case 'html'; + $tmp_href = $attr_url; + default: + $tmp_data = ''; } // if ( substr($tmp_url,0,10) != 'javascript' ) // $tmp_url = "javascript:loadViewByName('".$attr_target."','".$tmp_url.(isset($attr_anchor)?'#'.$attr_anchor:'')."'); return false;"; -?><a target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?>" name="<?php echo $attr_name ?>"<?php }else{ ?> href="javascript:void(0);" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo $attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo $attr_action ?>" data-method="<?php echo $attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?> title="<?php echo encodeHtml($attr_title) ?>">- \ No newline at end of file +?><a data-url="<?php echo $attr_url ?>" target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?>" name="<?php echo $attr_name ?>"<?php }else{ ?> href="<?php echo $tmp_href ?>" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo @$attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo @$attr_action ?>" data-method="<?php echo @$attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?> title="<?php echo encodeHtml($attr_title) ?>">+ \ No newline at end of file diff --git a/themes/default/include/html/page.inc.php b/themes/default/include/html/page.inc.php @@ -1,4 +1,85 @@ +<?php + if (!defined('OR_VERSION')) die('Forbidden'); + if (!headers_sent()) header('Content-Type: text/html; charset=UTF-8') +?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> + <title><?php echo OR_TITLE.' '.OR_VERSION ?></title> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" > +<?php if ( isset($refresh_url) ) { ?> + <meta http-equiv="refresh" content="<?php echo isset($refresh_timeout)?$refresh_timeout:0 ?>; URL=<?php echo $refresh_url; if (ini_get('session.use_trans_sid')) echo '&'.session_name().'='.session_id(); ?>"> +<?php } ?> + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > +<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu ) + { + ?> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > +<?php + } +?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) + { + ?> + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo $meta['title'] ?>" ><?php + } ?> + <link id="userstyle" rel="stylesheet" type="text/css" href="<?php echo css_link($style) ?>" > + + <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/skins/markitup/style.css" /> + <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/sets/default/style.css" /> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-1.6.2.min.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-ui/js/jquery-ui-1.8.16.custom.min.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery.scrollTo.js"></script> + <!-- + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery.mjs.nestedSortable.js"></script> + --> + + <!-- OpenRat internal JS --> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/openrat.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orHint.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orSearch.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orLinkify.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orTree.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orLoadView.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orAutoheight.js"></script> + <!-- + <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/wymeditor/wymeditor/jquery.wymeditor.min.js"></script> + --> + <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/jquery.markitup.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/editor/ckeditor.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/editor/adapters/jquery.js"></script> + <!-- + <script src="/~dankert/cms-test/cms09/themes/default/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script> + <script src="/~dankert/cms/themes/default/js/xxxxxxxxxxxjquery-plugin-orSearchBox.js"></script> + <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-ui/css/pepper-grinder/jquery-ui-1.8.9.custom.css" > + --> </head> + + + <body> + +<script type="text/javascript"> +<!-- +// Konstanten +var OR_THEMES_EXT_DIR = '<?php echo OR_THEMES_EXT_DIR ?>'; +var OR_CONTROLLER_FILE = '<?php echo OR_CONTROLLER_FILE ?>'; +var REQ_PARAM_TOKEN = '<?php echo REQ_PARAM_TOKEN ?>'; +var REQ_PARAM_ACTION = '<?php echo REQ_PARAM_ACTION ?>'; +var REQ_PARAM_SUBACTION = '<?php echo REQ_PARAM_SUBACTION ?>'; +var REQ_PARAM_TARGETSUBACTION = '<?php echo REQ_PARAM_TARGETSUBACTION ?>'; +var REQ_PARAM_ID = '<?php echo REQ_PARAM_ID ?>'; +var REQ_PARAM_OBJECT_ID = '<?php echo REQ_PARAM_OBJECT_ID ?>'; +var REQ_PARAM_LANGUAGE_ID = '<?php echo REQ_PARAM_LANGUAGE_ID ?>'; +var REQ_PARAM_MODEL_ID = '<?php echo REQ_PARAM_MODEL_ID ?>'; +var REQ_PARAM_PROJECT_ID = '<?php echo REQ_PARAM_PROJECT_ID ?>'; +var REQ_PARAM_ELEMENT_ID = '<?php echo REQ_PARAM_ELEMENT_ID ?>'; +var REQ_PARAM_TEMPLATE_ID = '<?php echo REQ_PARAM_TEMPLATE_ID ?>'; +var REQ_PARAM_DATABASE_ID = '<?php echo REQ_PARAM_DATABASE_ID ?>'; +var REQ_PARAM_TARGET = '<?php echo REQ_PARAM_TARGET ?>'; +// --> +</script> + + +<?php global $viewCache; /* Debug-Information */ if (@$showDuration||true) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($viewCache,true));echo "\n-->";} ?> + diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js @@ -430,6 +430,8 @@ function registerViewEvents( viewEl ) $(viewEl).find('tr.headline > td > input.checkbox').click( function() { $(this).closest('table').find('tr.data > td > input.checkbox').attr('checked',Boolean( $(this).attr('checked') ) ); }); + + $(viewEl).find('textarea').orAutoheight(); } diff --git a/themes/default/js/plugin/jquery-plugin-orLinkify.js b/themes/default/js/plugin/jquery-plugin-orLinkify.js @@ -28,7 +28,7 @@ jQuery.fn.orLinkify = function() else if ( type == 'external' ) { - location.href = $(this).attr('data-url'); + window.open( $(this).attr('data-url'),' _blank' ); } else if ( type == 'popup' ) diff --git a/themes/default/layout/index.php b/themes/default/layout/index.php @@ -23,7 +23,7 @@ ?> <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo $meta['title'] ?>" ><?php } ?> - <link id="userstyle" rel="stylesheet" type="text/css" href="<?php echo css_link() ?>" > + <link id="userstyle" rel="stylesheet" type="text/css" href="<?php echo css_link($style) ?>" > <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/skins/markitup/style.css" /> <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/sets/default/style.css" /> @@ -41,6 +41,7 @@ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orLinkify.js"></script> <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orTree.js"></script> <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orLoadView.js"></script> + <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orAutoheight.js"></script> <!-- <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/wymeditor/wymeditor/jquery.wymeditor.min.js"></script> --> diff --git a/themes/default/layout/perspective/administration.ini.php b/themes/default/layout/perspective/administration.ini.php @@ -4,8 +4,8 @@ icons=projectlist,userlist,grouplist,configuration [tree] -views=show -default=show +views=tree +default=tree action=tree refreshable=false diff --git a/themes/default/layout/perspective/header.php b/themes/default/layout/perspective/header.php @@ -1,112 +0,0 @@ -<?php - -function view_header( $name ) -{ - global $preselectobject; - - global $viewconfig; - global $conf; - $v = $viewconfig[$name]; - -?> - - -<div id="<?php echo $name ?>" data-action="<?php echo @$v['action'] ?>" class="frame<?php echo (@$v['refreshable']?' refreshable':'') ?><?php echo (@$v['modal']?' modal':'') ?>"> -<div class="window"> - -<div class="menu"> - -<div class="views"> -<ul class="views"> -<?php - - $viewlist = explode(',',$v['views']); - if ( empty($viewlist[0])) $viewlist = array(); - - - // Tabreiter pro View erzeugen - foreach( $viewlist as $vn ) - { - $tmp_text = langHtml('menu_'.$vn); - $liClass = 'action'.($vn==$v['default']?' active':''); - $icon_url = OR_THEMES_EXT_DIR.'default/images/icon/'.$vn.'.png'; - - ?><li data-method="<?php echo $vn ?>" class="<?php echo $liClass?>" title="<?php echo langHtml('menu_'.$vn.'_desc'); ?>"><?php - ?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php - ?></li><?php - } - - global $preselectobject; - if ( false && $name=='content' && is_object($preselectobject) ) - { - $tmp_text = $preselectobject->name; - $liClass = 'action active'; - $icon_url = OR_THEMES_EXT_DIR.'default/images/icon_'.$preselectobject->getType().'.png'; - - ?><li data-id="<?php echo $preselectobject->objectid ?>" data-method="edit" data-u="<?php echo $preselectobject->getType() ?>" class="<?php echo $liClass?>" title="<?php echo $preselectobject->description ?>"><?php - ?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php - ?></li><?php - } - - if ( /* Deaktiviert */ false && @$conf['help']['enabled'] ) - { - ?><a class="help" data-url="<?php echo $conf['help']['url'] ?>" data-suffix="<?php echo @$conf['help']['suffix'] ?>" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo $image_dir.'icon/help.png' ?>" /><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php - } - ?><?php - - - - ?> -</ul> - -<script name="javascript" type="text/javascript"> -<!-- -<?php -if ( $name=='content' ) -{ - global $preselectedobjects; - - foreach( $preselectedobjects as $object ) - { -?> -setTimeout( function() { openNewAction( '<?php echo $object->name; ?>','<?php echo $object->getType() ?>','<?php echo $object->objectid ?>',0 );} ,500); -<?php - } -} -?> -//--> -</script> -<div class="icons"> -<div class="icon"> - -<?php if (!empty($viewlist) || $name=='content') { /* Fenster-Menü anzeigen (sofern Views vorhanden) */ ?> -<img class="icon" src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/menu.gif' ?>" /> -<div class="dropdown dropdownalignright"> -<div class="entry clickable"><a href="javascript:void(0);" class="fullscreen" data-type="fullscreen"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/window/maximize.gif' ?>" title="<?php echo langHtml('window_fullscreen') ?>" /><?php echo langHtml('window_fullscreen') ?></a></div> -<?php - if ( @$conf['help']['enabled'] ) - { - ?><div class="entry clickable"><a href="javascript:void(0);" data-type="help" data-url="<?php echo $conf['help']['url'] ?>" data-suffix="<?php echo @$conf['help']['suffix'] ?>" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/help.png' ?>" /><?php echo langHtml('MENU_HELP') ?></a></div><?php - } - ?> -</div> -<?php } ?> -</div> -</div> -</div> - -</div> - -<?php /*echo langHtml( $v['title'] )*/ ?> - - -<!-- Hinweis-Meldungen --> - -<div class="content"> - <div class="empty"></div> -</div> - -</div> -</div> - -<?php } ?>- \ No newline at end of file diff --git a/themes/default/layout/perspective/normal.ini.php b/themes/default/layout/perspective/normal.ini.php @@ -5,8 +5,8 @@ icons=templatelist,languagelist [tree] title=navigator -views=show,settings -default=show +views=tree,settings +default=tree action=tree refreshable=false diff --git a/themes/default/layout/perspective/normal.php b/themes/default/layout/perspective/normal.php @@ -1,24 +0,0 @@ - -<div class="bar" id="navigationbar"> -<?php -view_header('tree'); -?> -</div> - -<div class="bar" id="contentbar"> -<?php -view_header('content'); -?> -</div> - -<div class="bar" id="sidebar"> -<?php -view_header('side'); -?> -</div> - -<div class="bar" id="bottombar"> -<?php -view_header('bottom'); -?> -</div> diff --git a/themes/default/layout/perspective/window.php b/themes/default/layout/perspective/window.php @@ -0,0 +1,109 @@ +<?php + +function view_header( $name ) +{ + global $preselectobject; + + global $viewconfig; + global $conf; + $v = $viewconfig[$name]; + +?> + + +<div id="<?php echo $name ?>" data-action="<?php echo @$v['action'] ?>" class="frame<?php echo (@$v['refreshable']?' refreshable':'') ?><?php echo (@$v['modal']?' modal':'') ?>"> +<div class="window"> + +<div class="menu"> + +<div class="views"> +<ul class="views"> +<?php + + $viewlist = explode(',',$v['views']); + if ( empty($viewlist[0])) $viewlist = array(); + + + // Tabreiter pro View erzeugen + foreach( $viewlist as $vn ) + { + $tmp_text = langHtml('menu_'.$vn); + $liClass = 'action'.($vn==$v['default']?' active':''); + $icon_url = OR_THEMES_EXT_DIR.'default/images/icon/'.$vn.'.png'; + + ?><li data-method="<?php echo $vn ?>" class="<?php echo $liClass?>" title="<?php echo langHtml('menu_'.$vn.'_desc'); ?>"><?php + ?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php + ?></li><?php + } + + global $preselectobject; + if ( false && $name=='content' && is_object($preselectobject) ) + { + $tmp_text = $preselectobject->name; + $liClass = 'action active'; + $icon_url = OR_THEMES_EXT_DIR.'default/images/icon_'.$preselectobject->getType().'.png'; + + ?><li data-id="<?php echo $preselectobject->objectid ?>" data-method="edit" data-u="<?php echo $preselectobject->getType() ?>" class="<?php echo $liClass?>" title="<?php echo $preselectobject->description ?>"><?php + ?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php + ?></li><?php + } + + if ( /* Deaktiviert */ false && @$conf['help']['enabled'] ) + { + ?><a class="help" data-url="<?php echo $conf['help']['url'] ?>" data-suffix="<?php echo @$conf['help']['suffix'] ?>" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo $image_dir.'icon/help.png' ?>" /><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php + } + ?><?php + + + + ?> +</ul> + +<script name="javascript" type="text/javascript"> +<!-- +<?php +if ( $name=='content' && count(@$preselectedobjects)>0 ) +{ + global $preselectedobjects; + $object = $preselectedobjects[ count($preselectedobjects)-1]; +?> +setTimeout( function() { openNewAction( '<?php echo $object->name; ?>','<?php echo $object->getType() ?>','<?php echo $object->objectid ?>',0 );} ,500); +<?php +} +?> +//--> +</script> +<div class="icons"> +<div class="icon"> + +<?php if (!empty($viewlist) || $name=='content') { /* Fenster-Menü anzeigen (sofern Views vorhanden) */ ?> +<img class="icon" src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/menu.gif' ?>" /> +<div class="dropdown dropdownalignright"> +<div class="entry clickable"><a href="javascript:void(0);" class="fullscreen" data-type="fullscreen"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/window/maximize.gif' ?>" title="<?php echo langHtml('window_fullscreen') ?>" /><?php echo langHtml('window_fullscreen') ?></a></div> +<?php + if ( @$conf['help']['enabled'] ) + { + ?><div class="entry clickable"><a href="javascript:void(0);" data-type="help" data-url="<?php echo $conf['help']['url'] ?>" data-suffix="<?php echo @$conf['help']['suffix'] ?>" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/help.png' ?>" /><?php echo langHtml('MENU_HELP') ?></a></div><?php + } + ?> +</div> +<?php } ?> +</div> +</div> +</div> + +</div> + +<?php /*echo langHtml( $v['title'] )*/ ?> + + +<!-- Hinweis-Meldungen --> + +<div class="content"> + <div class="empty"></div> +</div> + +</div> +</div> + +<?php } ?>+ \ No newline at end of file diff --git a/themes/default/layout/perspective/workbench.php b/themes/default/layout/perspective/workbench.php @@ -0,0 +1,24 @@ + +<div class="bar small" id="navigationbar"> +<?php +view_header('tree'); +?> +</div> + +<div class="bar wide" id="contentbar"> +<?php +view_header('content'); +?> +</div> + +<div class="bar small" id="sidebar"> +<?php +view_header('side'); +?> +</div> + +<div class="bar wide" id="bottombar"> +<?php +view_header('bottom'); +?> +</div> diff --git a/themes/default/templates/file/edit.tpl.src.xml b/themes/default/templates/file/edit.tpl.src.xml @@ -1,6 +1,8 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <form> + <header views="value" /> + <part class="label" /> <part class="line"> <part class="input"> <newline></newline> diff --git a/themes/default/templates/file/editvalue.tpl.src.xml b/themes/default/templates/file/editvalue.tpl.src.xml @@ -1,3 +0,0 @@ -<output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window><row><column><text text="GLOBAL_VALUE"></text></column><column><inputarea rows="40" name="value" class="editor"></inputarea></column></row><row><column class="act" colspan="2"><button type="ok"></button></column></row></window></form><focus field="value"></focus></dummy></output>- \ No newline at end of file diff --git a/themes/default/templates/file/preview.tpl.src.xml b/themes/default/templates/file/preview.tpl.src.xml @@ -1,12 +1,4 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <insert url="var:preview_url"></insert> - <link class="action" action="file" subaction="edit"> - <image file="icon/edit"></image> - <text key="menu_file_edit"></text> - </link> - <link class="action" action="file" subaction="editvalue"> - <image file="icon/editvalue"></image> - <text key="menu_file_editvalue"></text> - </link> </output> \ No newline at end of file diff --git a/themes/default/templates/file/value.tpl.src.xml b/themes/default/templates/file/value.tpl.src.xml @@ -0,0 +1,3 @@ +<output xmlns="http://www.openrat.de/template" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window><row><column><text text="GLOBAL_VALUE"></text></column><column><inputarea rows="40" name="value" class="editor"></inputarea></column></row><row><column class="act" colspan="2"><button type="ok"></button></column></row></window></form><focus field="value"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/filebrowser/browse.tpl.src.xml b/themes/default/templates/filebrowser/browse.tpl.src.xml @@ -1,3 +1,48 @@ -<output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><page><window icon="folder"><list list="notices" extract="true"><row class="headline"><column colspan="2"><text key="var:key"></text><newline></newline></column></row></list><table><row class="headline"><column><text key="GLOBAL_TYPE"></text><text raw="_/_"></text><text key="GLOBAL_NAME"></text></column><column><text key="GLOBAL_LASTCHANGE"></text></column></row><if present="up_url"><row class="data"><column width="50%" colspan="8"><link url="var:up_url"><image type="folder"></image><text raw="__.._____________________"></text></link></column></row></if><list list="object" extract="true"><row class="data"><column><link url="var:url" title="var:desc" class="var:class"><image type="var:icon"></image><text var="name"></text><text raw="_"></text></link></column><column><date date="var:date"></date></column></row></list><if empty="object"><row><column colspan="2"><text text="GLOBAL_NOT_FOUND"></text></column></row></if><if true="var:writable"><row><column class="act" colspan="2"><newline></newline><form action="filebrowser" subaction="upload" id="var:id" enctype="multipart/form-data"><hidden name="CKEditorFuncNum"></hidden><text key="file"></text><text raw="__"></text><upload name="file"></upload><text raw="__"></text><button type="ok" text="add"></button></form><newline></newline><newline></newline><set var="name" value=""></set><form action="filebrowser" subaction="addfolder" id="var:id"><hidden name="CKEditorFuncNum"></hidden><text key="folder"></text><text raw="__"></text><input name="name"></input><text raw="__"></text><button type="ok" text="add"></button></form></column></row></if></table></window></page></output>- \ No newline at end of file +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> + <page> + <table> + <row class="headline"> + <column> + <text key="GLOBAL_TYPE"></text> + <text raw="_/_"></text> + <text key="GLOBAL_NAME"></text> + </column> + <column> + <text key="GLOBAL_LASTCHANGE"></text> + </column> + </row> + <if present="up_url"> + <row class="data"> + <column width="50%" colspan="8"> + <link type="html" url="var:up_url"> + <image type="folder"></image> + <text raw="__.._____________________"></text> + </link> + </column> + </row> + </if> + <list list="object" extract="true"> + <row class="data"> + <column class="clickable"> + <link type="html" url="var:url" title="var:desc" class="var:class"> + <image type="var:icon"></image> + <text var="name"></text> + <text raw="_"></text> + </link> + </column> + <column> + <date date="var:date"></date> + </column> + </row> + </list> + <if empty="object"> + <row> + <column colspan="2"> + <text text="GLOBAL_NOT_FOUND"></text> + </column> + </row> + </if> + </table> + </page> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/folder/createfile.tpl.src.xml b/themes/default/templates/folder/createfile.tpl.src.xml @@ -1,3 +1,58 @@ -<output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><header back="true"></header><form enctype="multipart/form-data" target="upload" type="upload"><hidden name="type" default="file"></hidden><window title="" name=""><row><column><text text="global_FILE"></text></column><column><upload name="file" maxlength="var:maxlength"></upload><insert url="" name="upload"></insert></column></row><row><column colspan="2"><text class="help" key="file_max_size"></text><text raw="_"></text><text var="max_size"></text><newline></newline><newline></newline></column></row><row><column><text key="HTTP_URL"></text></column><column><input name="url" size="50"></input></column></row><row><column colspan="2"><group title="message:description"></group></column></row><row><column><text text="global_NAME"></text></column><column><input name="name" size="50"></input></column></row><row><column><text text="global_DESCRIPTION"></text></column><column><inputarea rows="5" cols="50" name="description"></inputarea><newline></newline></column></row></window></form><focus field="name"></focus></output>- \ No newline at end of file +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> + <header back="true"></header> + <form enctype="multipart/form-data" target="upload" type="upload" visible="true"> + <hidden name="type" default="file"></hidden> + <window title="" name=""> + <row> + <column> + <text text="global_FILE"></text> + </column> + <column> + <upload name="file" maxlength="var:maxlength"></upload> + <insert url="" name="upload"></insert> + </column> + </row> + <row> + <column colspan="2"> + <text class="help" key="file_max_size"></text> + <text raw="_"></text> + <text var="max_size"></text> + <newline></newline> + <newline></newline> + </column> + </row> + <row> + <column> + <text key="HTTP_URL"></text> + </column> + <column> + <input name="url" size="50"></input> + </column> + </row> + <row> + <column colspan="2"> + <group title="message:description"></group> + </column> + </row> + <row> + <column> + <text text="global_NAME"></text> + </column> + <column> + <input name="name" size="50"></input> + </column> + </row> + <row> + <column> + <text text="global_DESCRIPTION"></text> + </column> + <column> + <inputarea rows="5" cols="50" name="description"></inputarea> + <newline></newline> + </column> + </row> + </window> + </form> + <focus field="name"></focus> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/folder/createfolder.tpl.src.xml b/themes/default/templates/folder/createfolder.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true"></header> - <form> + <form visible="true" label="message:add"> <part class="line"> <part class="label"> <text text="global_FOLDER"></text> diff --git a/themes/default/templates/login/license.tpl.src.xml b/themes/default/templates/login/license.tpl.src.xml @@ -1,7 +1,26 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <header><link type="external" url="config:login/gpl/url" target="_top" - class="copyright"><text key="GPL"></text></link><group></group><list list="software" - extract="true"><link type="external" url="var:url"><text var="name"></text></link><text - var="license"></text><newline></newline><newline></newline></list></header> + <newline /> + <table> + <row class="headline"> + <column> + <text key="name" /> + </column> + <column> + <text key="license" /> + </column> + </row> + <list list="software" extract="true"> + <row class="data"> + <column class="clickable"> + <link type="external" url="var:url"> + <text var="name"></text> + </link> + </column> + <column> + <text var="license"></text> + </column> + </row> + </list> + </table> </output> \ No newline at end of file diff --git a/themes/default/templates/page/preview.tpl.src.xml b/themes/default/templates/page/preview.tpl.src.xml @@ -1,20 +1,9 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <header views="el"></header> - <group title="message:menu_page_show"> - <part> - <insert url="var:preview_url" name="preview"></insert> - </part> - </group> - <link class="action" action="page" subaction="preview" target="preview"> - <image icon="show"></image> - <text key="menu_page_show"></text> - </link> - <link class="action" action="page" subaction="edit" target="preview"> - <image icon="show"></image> - <text key="menu_page_edit"></text> - </link> - <link type="popup" class="action" url="var:preview_url"> - <text key="link_open_in_new_window"></text> - </link> + <insert url="var:preview_url" name="preview"></insert> + <part class="clickable"> + <link type="popup" class="action" url="var:preview_url"> + <text key="link_open_in_new_window"></text> + </link> + </part> </output> \ No newline at end of file diff --git a/themes/default/templates/pageelement/edit.tpl.src.xml b/themes/default/templates/pageelement/edit.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="link,import,export"></header> - <form method="post" label="message:save"> + <form method="post" label="message:save" visible="yes"> <input type="hidden" name="elementid"></input> <input type="hidden" name="value_time"></input> <window name="element"> diff --git a/themes/default/templates/template/edit.tpl.src.xml b/themes/default/templates/template/edit.tpl.src.xml @@ -1,11 +1,56 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <header views="src,addel,srcelement,el,remove"></header> - <window name="TEMPLATE_SHOW"> - <row> + <header views="src,remove"></header> + + <table> + <row class="headline"> + <column> + <text key="name"></text> + </column> + <column> + <text key="type"></text> + </column> + </row> + <list list="elements" extract="true"> + <row class="data"> + <column id="var:id" name="var:name" action="element"> + <image elementtype="var:type"></image> + <text var="name" title="var:description"></text> + </column> <column> - <text var="text" escape="false" type="code"></text> + <text key="var:type" prefix="EL_"></text> + </column> + </row> + </list> + <if empty="el"> + <row> + <column colspan="2"> + <text key="GLOBAL_NOT_FOUND"></text> </column> </row> - </window> + </if> + <row class="data"> + <column colspan="2" class="clickable"> + <link type="view" subaction="addel"> + <image icon="add" /> + <text key="menu_template_addel"></text> + </link> + </column> + </row> + </table> + + <group title="message:src"> + <table> + <row class="data"> + <column class="clickable"> + <link type="view" subaction="src"> + <image icon="template" /> + <text key="edit"></text> + </link> + </column> + </row> + </table> + + <text var="text" escape="false" type="code"></text> + </group> </output> \ No newline at end of file diff --git a/themes/default/templates/template/el.tpl.src.xml b/themes/default/templates/template/el.tpl.src.xml @@ -1,39 +0,0 @@ -<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <table> - <row class="headline"> - <column> - <text key="name"></text> - </column> - <column> - <text key="type"></text> - </column> - </row> - <list list="el" extract="true"> - <row class="data"> - <column id="var:id" name="var:name" action="element"> - <image elementtype="var:type"></image> - <text var="name"></text> - </column> - <column> - <text key="var:type" prefix="EL_"></text> - </column> - </row> - </list> - <if empty="el"> - <row> - <column colspan="2"> - <text key="GLOBAL_NOT_FOUND"></text> - </column> - </row> - </if> - <row class="data"> - <column colspan="2"> - <link type="view" subaction="addel"> - <image icon="add"/> - <text key="menu_template_addel"></text> - </link> - </column> - </row> - </table> -</output>- \ No newline at end of file diff --git a/themes/default/templates/template/src.tpl.src.xml b/themes/default/templates/template/src.tpl.src.xml @@ -1,22 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <header back="true"></header> + <header views="srcelement" back="true"></header> <form> - <row> - <column> - <inputarea rows="25" cols="80" name="src" class="editor"></inputarea> - </column> - </row> - <row> - <column class="act"> - <button type="ok"></button> - <if false="mode:edit"> - <link class="action" action="template" subaction="srcelement"> - <text key="menu_template_srcelement"></text> - </link> - </if> - </column> - </row> + <inputarea rows="25" cols="80" name="src" class="editor"></inputarea> </form> - <focus field="src"></focus> </output> \ No newline at end of file diff --git a/themes/default/templates/tree/show.tpl.src.xml b/themes/default/templates/tree/show.tpl.src.xml @@ -1,6 +0,0 @@ -<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <header views="projecttimeline,userprojecttimeline" /> - - <insert function="loadTree"></insert> -</output>- \ No newline at end of file diff --git a/themes/default/templates/tree/tree.tpl.src.xml b/themes/default/templates/tree/tree.tpl.src.xml @@ -0,0 +1,6 @@ +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> + <header views="projecttimeline,userprojecttimeline" /> + + <insert function="loadTree"></insert> +</output>+ \ No newline at end of file diff --git a/util/Http.class.php b/util/Http.class.php @@ -420,7 +420,24 @@ class Http */ function notAuthorized($text,$message) { - Http::sendStatus(403,'Not Authorized',$message); + Http::sendStatus(403,$text,$message); + } + + + + + + + /** + * Der Benutzer ist nicht autorisiert, eine Aktion auszufuehren. + * Diese Funktion erzeugt einen "HTTP 403 Not Authorized" und das + * Skript wird beendet. + * + * @param String $message Eigener Hinweistext + */ + function notFound($text,$message) + { + Http::sendStatus(404,$text,$message); } diff --git a/util/Preferences.class.php b/util/Preferences.class.php @@ -106,7 +106,60 @@ class Preferences $conf['config']['last_modification'] = filemtime($filename); $conf['config']['file_modification'] = date('r',filemtime($filename)); $conf['config']['read' ] = date('r'); + + Preferences::fixConfiguration( &$conf ); + return $conf; } + + + public static function fixConfiguration( &$conf ) + { + $defaultStyleConfig = array( + 'name'=>'Unnamed', + 'title_background_color'=>'grey', + 'title_text_color'=>'white', + 'text_color' => 'black', + 'background_color' => '#d9d9d9', + 'inactive_background_color' => 'silver' + ); + + $defaultDatabaseConfig = array( + 'enabled' =>true, + 'comment2' =>'', + 'user' =>'', + 'password' => '', + 'host' =>'localhost', + 'port' => '', + 'database' => '', + 'base64' => false, + 'prefix' => 'or_', + 'persistent' => true, + 'charset' => 'UTF-8', + 'connection_sql'=> '', + 'cmd' => '', + 'prepare' => false, + 'transaction' => false, + 'autocommit' => false, + 'readonly' => false + ); + + $dbconfig = &$conf['database']; + if ( is_array($dbconfig) ) + foreach( $dbconfig as &$db ) + { + if ( is_array($db)) + $db = array_merge( $defaultDatabaseConfig,$db ); + } + + $styleconfig = &$conf['style']; + if ( is_array($styleconfig) ) + foreach( $styleconfig as &$style ) + { + if ( is_array($style)) + $style = array_merge( $defaultStyleConfig, $style ); + } + + } } ?> \ No newline at end of file diff --git a/util/Publish.class.php b/util/Publish.class.php @@ -102,7 +102,7 @@ class Publish function Publish() { global $conf; - $conf_project = $conf['publish']['project']; + $confPublish = $conf['publish']; if ( $conf['security']['nopublish'] ) { @@ -115,9 +115,16 @@ class Publish // Feststellen, ob FTP benutzt wird. // Dazu muss FTP aktiviert sein (enable=true) und eine URL vorhanden sein. - if ( @$conf['publish']['ftp']['enable'] && - ( !empty($project->ftp_url) || - isset($conf['publish']['ftp']['host']) ) ) + $ftpUrl = ''; + if ( $conf['publish']['ftp']['enable'] ) + { + if ( $conf['publish']['ftp']['per_project'] && !empty($project->ftp_url) ) + $ftpUrl = $project->ftp_url; + elseif ( !empty($conf['publish']['ftp']['host']) ) + $ftpUrl = $project->ftp_url; + } + + if ( ! empty($ftpUrl) ) { $this->with_ftp = true; $this->ftp = new Ftp( $project->ftp_url ); // Aufbauen einer FTP-Verbindung @@ -133,13 +140,18 @@ class Publish } $localDir = ereg_replace( '\/$','',$project->target_dir); - if ( empty( $localDir)) - $localDir = $project->name; - - if ( $conf_project['override_publish_dir'] && $localDir != basename($localDir) ) - $this->local_destdir = $localDir; - else - $this->local_destdir = $conf_project['publish_dir'].$localDir; + + if ( $confPublish['filesystem']['per_project'] && (!empty($localDir)) ) + { + $this->local_destdir = $localDir; // Projekteinstellung verwenden. + } + else + { + if ( empty( $localDir)) + $localDir = $project->name; + // Konfiguriertes Verzeichnis verwenden. + $this->local_destdir = $confPublish['filesystem']['directory'].$localDir; + } // Sofort pruefen, ob das Zielverzeichnis ueberhaupt beschreibbar ist. @@ -158,11 +170,14 @@ class Publish $this->content_negotiation = ( $project->content_negotiation == '1' ); $this->cut_index = ( $project->cut_index == '1' ); - - if ( $conf_project['override_system_command'] && !empty($project->cmd_after_publish) ) - $this->cmd_after_publish = $project->cmd_after_publish; - else - $this->cmd_after_publish = @$conf_project['system_command']; + + if ( $confPublish['command']['enable'] ) + { + if ( $confPublish['command']['per_project'] && !empty($project->cmd_after_publish) ) + $this->cmd_after_publish = $project->cmd_after_publish; + else + $this->cmd_after_publish = @$confPublish['command']['command']; + } // Im Systemkommando Variablen ersetzen $this->cmd_after_publish = str_replace('{name}' ,$project->name ,$this->cmd_after_publish); @@ -288,6 +303,7 @@ class Publish { if ( $this->with_ftp ) { + Logger::debug('Closing FTP connection' ); $this->ftp->close(); } @@ -295,7 +311,8 @@ class Publish if ( !empty($this->cmd_after_publish) && $this->ok ) { $ausgabe = array(); - $rc = false; + $rc = false; + Logger::debug('Executing system command: '.$this->cmd_after_publish ); exec( $this->cmd_after_publish,$ausgabe,$rc ); if ( $rc != 0 ) // Wenn Returncode ungleich 0, dann Ausgabe ins Log schreiben und Fehler melden.