commit 4867ddbbe13fef5a9a31c7c2c1fa38d1efecd096
parent f747001d291f80e51d2ecf661e51552df3de2d2a
Author: Jan Dankert <devnull@localhost>
Date: Tue, 18 Dec 2018 08:40:15 +0100
Fix: Wenn Methoden statisch aufgerufen werden, diese auch als statisch markieren.
Diffstat:
4 files changed, 35 insertions(+), 49 deletions(-)
diff --git a/modules/cms-core/action/PageelementAction.class.php b/modules/cms-core/action/PageelementAction.class.php
@@ -1227,6 +1227,7 @@ class PageelementAction extends Action
private function savelink()
{
$value = new Value();
+ $value->publisher = $this->page->publisher;
$value->languageid = $this->page->languageid;
$value->objectid = $this->page->objectid;
$value->pageid = Page::getPageIdFromObjectId( $this->page->objectid );
diff --git a/modules/cms-core/model/Group.class.php b/modules/cms-core/model/Group.class.php
@@ -49,24 +49,23 @@ class Group
}
- // Lesen aller Gruppen aus der Datenbank
- function getAll()
+ /**
+ * Read all groups
+ */
+ public static function getAll()
{
- global $conf;
- $db = db_connection();
-
- $sql = $db->sql( 'SELECT id,name FROM {{group}}' );
+ $stmt = db()->sql( 'SELECT id,name FROM {{group}}' );
- return $sql->getAssoc();
+ return $stmt->getAssoc();
}
- // Lesen Gruppe aus der Datenbank
- function load()
+ /**
+ * Lesen Gruppe aus der Datenbank
+ */
+ public function load()
{
- $db = db_connection();
-
- $sql = $db->sql( 'SELECT * FROM {{group}}'.
+ $sql = db()->sql( 'SELECT * FROM {{group}}'.
' WHERE id={groupid}' );
$sql->setInt( 'groupid',$this->groupid );
@@ -78,12 +77,15 @@ class Group
}
- // Lesen einer Gruppe aus der Datenbank
+ /**
+ * Read a group.
+ * @param $name string name of the group
+ * @return Group
+ * @throws \ObjectNotFoundException
+ */
public static function loadWithName( $name )
{
- $db = db_connection();
-
- $sql = $db->sql( 'SELECT * FROM {{group}}'.
+ $sql = db()->sql( 'SELECT * FROM {{group}}'.
' WHERE name={name}' );
$sql->setString('name',$name );
@@ -102,16 +104,16 @@ class Group
}
- // Speichern Benutzer in der Datenbank
- function save()
+ /**
+ * Save a group.
+ */
+ public function save()
{
if ( empty($this->name) )
$this->name = lang('GLOBAL_GROUP').' '.$this->groupid;
- $db = db_connection();
-
- // Gruppe speichern
- $sql = $db->sql( 'UPDATE {{group}} '.
+ // Gruppe speichern
+ $sql = db()->sql( 'UPDATE {{group}} '.
'SET name = {name} '.
'WHERE id={groupid}' );
$sql->setString( 'name' ,$this->name );
diff --git a/modules/cms-core/model/User.class.php b/modules/cms-core/model/User.class.php
@@ -68,13 +68,14 @@ class User extends ModelBase
}
- // Lesen Benutzer aus der Datenbank
- function listAll()
+ /**
+ * get all users.
+ *
+ * @return array
+ */
+ public static function listAll()
{
- global $conf;
- $db = db_connection();
-
- $sql = $db->sql( 'SELECT id,name '.
+ $sql = db()->sql( 'SELECT id,name '.
' FROM {{user}}'.
' ORDER BY name' );
@@ -152,24 +153,6 @@ SQL
}
- // Prueft, ob der Benutzer fuer ein Projekt berechtigt ist
- function hasProject( $projectid )
- {
- $db = db_connection();
-
- $sql = $db->sql( 'SELECT COUNT(*)'.
- ' FROM {{acl}}'.
- ' LEFT JOIN {{object}} ON {{object}}.id={{acl}}.objectid '.
- ' WHERE projectid={projectidid} AND '.
- ' ( userid={userid} OR'.
- ' '.$this->getGroupClause().' )' );
- $sql->setInt ( 'userid',$this->userid );
-
- return $sql->getOne() > 0;
- }
-
-
-
/**
* Lesen aller Projekte, fuer die der Benutzer berechtigt ist.
*
diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.php b/modules/cms-ui/themes/default/html/views/folder/edit.php
@@ -191,9 +191,9 @@
</div>
<div class="input">
<div class="selector">
-<div class="inputholder">
-<input type="hidden" class="or-droppable" name="targetobjectid" value="<?php echo $rootfolderid ?>" />
-<input type="text" disabled="disabled" value="<?php echo $rootfoldername ?>" />
+<div class="inputholder or-droppable">
+<input type="hidden" class="or-selector-link-value" name="targetobjectid" value="<?php echo $rootfolderid ?>" />
+<input type="text" class="or-selector-link-name" disabled="disabled" value="<?php echo $rootfoldername ?>" />
</div>
<div class="tree selector" data-types="{types}" data-init-id="<?php echo $rootfolderid ?>" data-init-folderid="<?php echo $rootfolderid ?>">