[usermanagement] Merge changes from 'gitlab.c3sl.ufpr.br/cdn/slx-admin.git'

2 files changed, 47 insertions, 15 deletions

diff --git a/inc/pagination.inc.php b/inc/pagination.inc.php
new file mode 100644
index 00000000..65785a36
--- /dev/null
+++ b/inc/pagination.inc.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * TODO: Why does this class exist?
+ * There's already the Paginate class which works more efficient by using the LIMIT statement
+ * for the query, and has more options. Consider refactoring the places where this class is
+ * used (see syslog or eventlog for usage examples), then get rid of this one.
+ */
+class Pagination
+{
+	private $items;
+	private $page;
+	private $maxItems;
+
+	public function __construct($par1, $par2)
+	{
+		$this->items = $par1;
+		$this->page = $par2;
+
+		$this->maxItems = 5;
+	}
+
+	public function getPagination()
+	{
+		$ret = array();
+		$n = ceil(count($this->items) / $this->maxItems);
+		for ($i = 1; $i <= $n; $i++) {
+			$class = ($i == $this->page) ? 'active' : '';
+			$ret[] = array(
+				'class' => $class,
+				'page' => $i
+			);
+		}
+		return $ret;
+	}
+
+	public function getItems()
+	{
+		$ret = array();
+		$first = ($this->page - 1) * $this->maxItems;
+		for ($i = 0; $i < $this->maxItems; $i++) {
+			if ($first + $i < count($this->items))
+				$ret[] = $this->items[$first + $i];
+		}
+		return $ret;
+	}
+}
\ No newline at end of file
diff --git a/inc/user.inc.php b/inc/user.inc.php
index 49500aa2..dc603dac 100644
--- a/inc/user.inc.php
+++ b/inc/user.inc.php
@@ -97,19 +97,4 @@ class User
 		return self::$user['lasteventid'];
 	}
 
-	public static function addUser($data){
-		Database::exec ( "INSERT INTO user SET login = :login, passwd = :pass, fullname = :name, phone = :phone, email = :email, permissions = 4", $data );
-		$ret = Database::queryFirst('SELECT userid FROM user WHERE login = :user LIMIT 1', array('user' => $data['login']));
-		$user = array(
-			'user' => $ret['userid']
-		);
-		Database::exec ( "INSERT INTO setting_partition SET partition_id = '44', size = '5G', mount_point = '/tmp', user = :user", $user );
-		Database::exec ( "INSERT INTO setting_partition SET partition_id = '43', size = '20G', mount_point = '/boot', options = 'bootable', user = :user", $user );
-		Database::exec ( "INSERT INTO setting_partition SET partition_id = '40', size = '20G', mount_point = '/cache/export/dnbd3', user = :user", $user );
-		Database::exec ( "INSERT INTO setting_partition SET partition_id = '41', size = '5G', mount_point = '/home', user = :user", $user );
-		Database::exec ( "INSERT INTO setting_partition SET partition_id = '82', size = '1G', user = :user", $user );
-		Message::addSuccess('add-user');
-		EventLog::info ( User::getName () . ' created user ' . $data['login'] );
-	}
-
 }