openrat-cms

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

commit 7953c61015cdbbf4cb57f6ab9cbfcea9d42d3a52
parent f354027e29e527f95c6cdfa14c2f52a2ceffce32
Author: Jan Dankert <devnull@localhost>
Date:   Tue, 14 Aug 2018 23:25:50 +0200

Speichern und Anzeige von Informationen zur letzten Veröffentlichung: Name und Zeitpunkt. Feature #0000004

Diffstat:
modules/cms-core/action/FolderAction.class.php | 2+-
modules/cms-core/action/PageAction.class.php | 2+-
modules/cms-core/model/BaseObject.class.php | 71+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
modules/cms-core/model/File.class.php | 2+-
modules/cms-core/model/Folder.class.php | 2+-
modules/cms-core/model/Page.class.php | 17+++++++++--------
modules/cms-core/model/Project.class.php | 26+++++++++++++++++++++++---
modules/cms-publish/Publish.class.php | 17+++++++++--------
modules/cms-ui/themes/default/html/views/file/info.php | 190+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml | 14++++++++++++++
modules/cms-ui/themes/default/html/views/page/info.php | 165+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
modules/cms-ui/themes/default/html/views/page/info.tpl.src.xml | 14++++++++++++++
modules/language/language.yml | 11++++++++++-
modules/util/config-default.php | 1-
14 files changed, 501 insertions(+), 33 deletions(-)

diff --git a/modules/cms-core/action/FolderAction.class.php b/modules/cms-core/action/FolderAction.class.php @@ -1522,7 +1522,7 @@ class FolderAction extends ObjectAction $files = ( $this->hasRequestVar('files' ) ); Session::close(); - $publish = new Publish(); + $publish = new Publish( $this->projectid ); $this->folder->publish = &$publish; $this->folder->publish( $pages,$files,$subdirs ); diff --git a/modules/cms-core/action/PageAction.class.php b/modules/cms-core/action/PageAction.class.php @@ -313,7 +313,7 @@ class PageAction extends ObjectAction $this->page->save(); $this->addNotice($this->page->getType(),$this->page->name,'PROP_SAVED','ok'); - if ( $this->hasRequestVar('creationTimestamp') && $this->currentUser->isAdmin ) + if ( $this->hasRequestVar('creationTimestamp') && $this->userIsAdmin() ) $this->page->createDate = $this->getRequestVar('creationTimestamp',OR_FILTER_NUMBER); $this->page->setCreationTimestamp(); } diff --git a/modules/cms-core/model/BaseObject.class.php b/modules/cms-core/model/BaseObject.class.php @@ -13,6 +13,8 @@ namespace { namespace cms\model { + use phpseclib\Math\BigInteger; + /** * Superklasse fuer Objekte im Projektbaum. * @@ -82,6 +84,17 @@ namespace cms\model { public $lastchangeUser; /** + * Benutzer, der das Objekt zuletzt veröffentlicht hat. + * @var User + */ + public $publishedUser; + /** + * Zeitpunkt der letzten Veröffentlichung. + * @var Integer + */ + public $publishedDate; + + /** * Kennzeichen, ob Objekt ein Ordner ist * @type Boolean */ @@ -327,7 +340,11 @@ SQL } - function getProperties() + /** + * Eigenschaften des Objektes. Kann durch Unterklassen erweitert werden. + * @return array + */ + public function getProperties() { return Array( 'id' =>$this->objectid, 'objectid' =>$this->objectid, @@ -340,6 +357,8 @@ SQL 'create_user' =>$this->createUser->getProperties(), 'lastchange_date' =>$this->lastchangeDate, 'lastchange_user' =>$this->lastchangeUser->getProperties(), + 'published_date' =>$this->publishedDate, + 'published_user' =>$this->publishedUser->getProperties(), 'isFolder' =>$this->isFolder, 'isFile' =>$this->isFile, 'isImage' =>$this->isImage, @@ -492,14 +511,16 @@ SQL */ function objectLoad() { - global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT {{object}}.*,' . + $stmt = $db->sql('SELECT {{object}}.*,' . ' {{name}}.name,{{name}}.descr,'. ' lastchangeuser.name as lastchange_username, '. ' lastchangeuser.fullname as lastchange_userfullname, '. ' lastchangeuser.mail as lastchange_usermail, '. + ' publisheduser.name as published_username, '. + ' publisheduser.fullname as published_userfullname, '. + ' publisheduser.mail as published_usermail, '. ' createuser.name as create_username, '. ' createuser.fullname as create_userfullname, '. ' createuser.mail as create_usermail '. @@ -508,13 +529,15 @@ SQL ' ON {{object}}.id={{name}}.objectid AND {{name}}.languageid={languageid} '. ' LEFT JOIN {{user}} as lastchangeuser '. ' ON {{object}}.lastchange_userid=lastchangeuser.id '. + ' LEFT JOIN {{user}} as publisheduser '. + ' ON {{object}}.published_userid=publisheduser.id '. ' LEFT JOIN {{user}} as createuser '. ' ON {{object}}.create_userid=createuser.id '. ' WHERE {{object}}.id={objectid}'); - $sql->setInt('languageid', $this->languageid); - $sql->setInt('objectid' , $this->objectid ); + $stmt->setInt('languageid', $this->languageid); + $stmt->setInt('objectid' , $this->objectid ); - $row = $sql->getRow(); + $row = $stmt->getRow(); if (count($row) == 0) throw new \ObjectNotFoundException('object '.$this->objectid.' not found'); @@ -571,9 +594,9 @@ SQL /** * Setzt die Eigenschaften des Objektes mit einer Datenbank-Ergebniszeile * - * @param row Ergebniszeile aus Datenbanktabelle + * @param array Ergebniszeile aus Datenbanktabelle */ - function setDatabaseRow( $row ) + public function setDatabaseRow( $row ) { if ( count($row)==0 ) die('setDatabaseRow() got empty array, oid='.$this->objectid); @@ -589,6 +612,7 @@ SQL $this->createDate = $row['create_date' ]; $this->lastchangeDate = $row['lastchange_date']; + $this->publishedDate = $row['published_date' ]; $this->createUser = new User(); $this->createUser->userid = $row['create_userid' ]; @@ -609,6 +633,16 @@ SQL $this->lastchangeUser->mail = $row['lastchange_usermail' ]; } + $this->publishedUser = new User(); + $this->publishedUser->userid = $row['published_userid' ]; + + if ( !empty($row['published_username']) ) + { + $this->publishedUser->name = $row['published_username' ]; + $this->publishedUser->fullname = $row['published_userfullname']; + $this->publishedUser->mail = $row['published_usermail' ]; + } + $this->typeid = $row['typeid']; $this->isFolder = ( $row['typeid'] == OR_TYPEID_FOLDER ); @@ -772,6 +806,27 @@ SQL } + public function setPublishedTimestamp() + { + $db = db_connection(); + + $sql = $db->sql('UPDATE {{object}} SET '. + ' published_date = {time} ,'. + ' published_userid = {userid} '. + ' WHERE id={objectid}'); + + $user = \Session::getUser(); + $this->publishedUser = $user; + $this->publishedDate = now(); + + $sql->setInt ('userid' ,$this->publishedUser->userid ); + $sql->setInt ('objectid',$this->objectid ); + $sql->setInt ('time' ,$this->publishedDate ); + + $sql->query(); + } + + /** * Logischen Namen und Beschreibung des Objektes in Datenbank speichern * (wird von objectSave() automatisch aufgerufen) diff --git a/modules/cms-core/model/File.class.php b/modules/cms-core/model/File.class.php @@ -443,7 +443,7 @@ EOF function publish() { if ( ! is_object($this->publish) ) - $this->publish = new \Publish(); + $this->publish = new \Publish( $this->projectid ); $this->write(); $this->publish->copy( $this->tmpfile(),$this->full_filename(),$this->lastchangeDate ); diff --git a/modules/cms-core/model/Folder.class.php b/modules/cms-core/model/Folder.class.php @@ -259,7 +259,7 @@ class Folder extends BaseObject { set_time_limit(300); if ( ! is_object($this->publish) ) - $this->publish = new \Publish(); + $this->publish = new \Publish( $this->projectid ); foreach( $this->getObjectIds() as $oid ) { diff --git a/modules/cms-core/model/Page.class.php b/modules/cms-core/model/Page.class.php @@ -716,26 +716,25 @@ class Page extends BaseObject */ public function publish() { - global $SESS; - $db = db_connection(); - if ( ! is_object($this->publish) ) - $this->publish = new \Publish(); + $this->publish = new \Publish( $this->projectid ); $this->public = true; - $allLanguages = Language::getAll(); - $allModels = Model::getAll(); + $project = Project::create( $this->projectid ); + + $allLanguages = $project->getLanguageIds(); + $allModels = $project->getModelIds(); // Schleife ueber alle Sprachvarianten - foreach( $allLanguages as $languageid=>$x ) + foreach( $allLanguages as $languageid ) { $this->languageid = $languageid; $this->withLanguage = count($allLanguages) > 1 || config('publish','filename_language') == 'always'; $this->withModel = count($allModels ) > 1 || config('publish','filename_type' ) == 'always'; // Schleife ueber alle Projektvarianten - foreach( $allModels as $projectmodelid=>$x ) + foreach( $allModels as $projectmodelid ) { $this->modelid = $projectmodelid; @@ -758,6 +757,8 @@ class Page extends BaseObject } } + parent::setPublishedTimestamp(); + } diff --git a/modules/cms-core/model/Project.class.php b/modules/cms-core/model/Project.class.php @@ -56,7 +56,8 @@ class Project extends ModelBase public $publishPageExtension = true; public $log = array(); - + + // Konstruktor public function __construct( $projectid='' ) @@ -65,8 +66,27 @@ class Project extends ModelBase $this->projectid = $projectid; } - - /** + + private static $cache = array(); + + /** + * @param $projectid + * @return Project + * @throws \ObjectNotFoundException + */ + public static function create($projectid) + { + if ( empty( Project::$cache[ $projectid ] ) ) + { + $project = new Project( $projectid ); + Project::$cache[ $projectid ] = $project; + $project->load(); + } + return Project::$cache[ $projectid ]; + } + + + /** * Stellt fest, ob die angegebene Projekt-Id existiert. * @param $id int Projekt-Id * @return boolean diff --git a/modules/cms-publish/Publish.class.php b/modules/cms-publish/Publish.class.php @@ -15,6 +15,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +use cms\model\Project; /** * Diese Klasse kapselt das Veroeffentlichen von Dateien.<br> @@ -97,28 +98,28 @@ class Publish * * @return Publish */ - function __construct() + function __construct( $projectid ) { - global $conf; - $confPublish = $conf['publish']; + $confPublish = config('publish'); - if ( $conf['security']['nopublish'] ) + if ( config('security','nopublish') ) { $this->ok = false; $this->log[] = 'publishing is disabled.'; return; } - $project = Session::getProject(); + $project = new Project( $projectid ); + $project->load(); // Feststellen, ob FTP benutzt wird. // Dazu muss FTP aktiviert sein (enable=true) und eine URL vorhanden sein. $ftpUrl = ''; - if ( $conf['publish']['ftp']['enable'] ) + if ( $confPublish['ftp']['enable'] ) { - if ( $conf['publish']['ftp']['per_project'] && !empty($project->ftp_url) ) + if ( $confPublish['ftp']['per_project'] && !empty($project->ftp_url) ) $ftpUrl = $project->ftp_url; - elseif ( !empty($conf['publish']['ftp']['host']) ) + elseif ( !empty($confPublish['ftp']['host']) ) $ftpUrl = $project->ftp_url; } diff --git a/modules/cms-ui/themes/default/html/views/file/info.php b/modules/cms-ui/themes/default/html/views/file/info.php @@ -0,0 +1,189 @@ + + + <form name="" target="_self" data-target="view" action="./" data-method="<?php echo OR_METHOD ?>" data-action="<?php echo OR_ACTION ?>" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="<?php echo OR_ACTION ?>" data-async="1" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo OR_ACTION ?>" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo OR_METHOD ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <fieldset class="<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + + </div> + <div class="input"> + <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + + </div> + <div class="input"> + <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> + + </div> + <div class="input"> + <span class="extension"><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + + </div> + <div class="input"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + + </div> + </div> + </div></fieldset> + <fieldset class="<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + + </label> + </div> + <div class="input"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_size" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_SIZE')))); ?></span> + + </label> + </div> + <div class="input"> + </div> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($size))); ?></span> + + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_mimetype" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_mimetype')))); ?></span> + + </label> + </div> + <div class="input"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($mimetype))); ?></span> + + <br/> + + <a class="action" target="_self" data-action="file" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('file','size','',array()) ?>"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_size'.'')))); ?></span> + + </a> + + </div> + </div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(lang('id'))))); ?></span> + + </div> + <div class="input"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + + </div> + </div> + <?php $if4=(!empty($cache_filename)); if($if4){?> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_cache_filename" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('CACHE_FILENAME')))); ?></span> + + </label> + </div> + <div class="input"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($cache_filename))); ?></span> + + <br/> + + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + + <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($cache_filemtime) ?> + + </div> + </div> + <?php } ?> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_pages" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_PAGES')))); ?></span> + + </label> + </div> + <div class="input"> + <table width="100%"> + <?php foreach($pages as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <tr> + <td> + <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_page.png" /> + + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + + </a> + + </td> + </tr> + <?php } ?> + </table> + <?php $if6=(empty($pages)); if($if6){?> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + + <?php } ?> + </div> + </div> + </div></fieldset> + <fieldset class="<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + + </div> + <div class="input"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + + <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($create_date) ?> + + <br/> + + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" /> + + <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($create_user) ?> + + </div> + </div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + + </div> + <div class="input"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + + <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + + <br/> + + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" /> + + <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> + + </div> + </div> + </div></fieldset> + <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml @@ -144,6 +144,20 @@ <user user="var:lastchange_user"></user> </part> </part> + <part class="line"> + <part class="label"> + <label for="published_date"> + <text text="global_published"></text> + </label> + </part> + <part class="input"> + <image icon="el_date"></image> + <date date="var:published_date"></date> + <newline></newline> + <image icon="user"></image> + <user user="var:published_user"></user> + </part> + </part> </group> </form> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/info.php b/modules/cms-ui/themes/default/html/views/page/info.php @@ -0,0 +1,164 @@ + + + + + <form name="" target="_self" data-target="view" action="./" data-method="<?php echo OR_METHOD ?>" data-action="<?php echo OR_ACTION ?>" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="<?php echo OR_ACTION ?>" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo OR_ACTION ?>" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo OR_METHOD ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <fieldset class="<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + + </div> + <div class="input"> + <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + + </div> + <div class="input"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + + </div> + <div class="input"> + <span class="description"><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + + </div> + </div> + </div></fieldset> + <fieldset class="<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + + </label> + </div> + <div class="input"> + <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_template_name" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_template')))); ?></span> + + </label> + </div> + <div class="input"> + <?php $if6=(!empty($template_url)); if($if6){?> + <a target="_self" data-url="<?php echo $template_url ?>" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/template.png" /> + + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + + </a> + + <?php } ?> + <?php $if6=(empty($template_url)); if($if6){?> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> + + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + + <?php } ?> + </div> + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_mime_type" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FILE_MIMETYPE'.'')))); ?></span> + + </label> + </div> + <div class="input"> + <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($mime_type))); ?></span> + + </div> + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_objectid" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + + </label> + </div> + <div class="input"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + + </div> + </div> + </div></fieldset> + <fieldset class="<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_create_date" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + + </label> + </div> + <div class="input"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + + <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($create_date) ?> + + <br/> + + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" /> + + <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($create_user) ?> + + </div> + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_lastchange_date" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + + </label> + </div> + <div class="input"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + + <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + + <br/> + + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" /> + + <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> + + </div> + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + + </label> + </div> + <div class="input"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + + <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($published_date) ?> + + <br/> + + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" /> + + <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($published_user) ?> + + </div> + </div> + </div></fieldset> + <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/info.tpl.src.xml @@ -108,6 +108,20 @@ <user user="var:lastchange_user"></user> </part> </part> + <part class="line"> + <part class="label"> + <label for="published_date"> + <text text="global_published"></text> + </label> + </part> + <part class="input"> + <image icon="el_date"></image> + <date date="var:published_date"></date> + <newline></newline> + <image icon="user"></image> + <user user="var:published_user"></user> + </part> + </part> </group> </form> </output> \ No newline at end of file diff --git a/modules/language/language.yml b/modules/language/language.yml @@ -5248,6 +5248,12 @@ PROJECT_NAME: en: Project description fr: Description de projet ru: Описание проекта +PROJECT_HOSTNAME: + de: Hostname + en: Hostname +PROJECT_NAME_DESC: + de: Hostname, unter dem das Projekt erreichbar ist. + en: Hostname under which the project is reachable PROJECT_SELECT_DESC: de: Wenn Sie ein anderes Projekt bearbeiten möchten, so wählen Sie hier eines aus. en: Work in an other project @@ -5831,12 +5837,15 @@ FILE_IMAGE_NEW_WIDTH: fr: Nouvelle largeur it: Nueva anchura ru: Новая ширина климата -GLOBAL_LANGAUGE: +GLOBAL_LANGUAGE: en: Language es: Langue fr: Langue it: Lengua ru: Ключевые Язык Sprache +GLOBAL_PUBLISH: + en: Published + de: Veröffentlicht GLOBAL_NO_TEMPLATES_AVAILABLE_DESC: en: 'Hint: There are no templates available.' es: '<em>Hint : </em> là ne sont aucun calibre disponible.' diff --git a/modules/util/config-default.php b/modules/util/config-default.php @@ -679,7 +679,6 @@ function createDefaultConfig() $conf['publish']['filename_type']='always'; $conf['publish']['style']="id"; $conf['publish']['url']='relative'; - $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;