fix popup display position in Y axis

.travis.yml

@@ -0,0 +1,25 @@
+branches:
+  only:
+    - master
+
+
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y python-sqlalchemy python-mysqldb python-twisted-web python-ldap python-gobject xsltproc docbook-xsl
+
+install: sh -c ' cd core && sh autogen.sh && ./configure && make && sudo make install &&  cd ../pulse2 && sh autogen.sh && ./configure && make && sudo make install '
+
+script:
+    - echo "DONE"
+
+notifications:
+  email:
+    recipients:
+      - [email protected]
+    on_success: change
+    on_failure: always
+  irc:
+    channels:
+      - "irc01.siveo.net#main"
+    on_success: always #|never|change] # default: always
+    on_failure: always #|never|change] # default: always

README.md

@@ -1,6 +1,22 @@
-## Mandriva Management Console ##
+## Pulse - IT Infrastructure Management Software ##
 
-This repository is the place where you will find **Mandriva Directory Server** and **Mandriva Pulse** projects.
-Both share the same framework: **Mandriva Management Console**, this is why you have to install the core part first.
+<a href='http://pulse-automation-tools.readthedocs.org/en/latest/?badge=latest'>
+    <img src='https://readthedocs.org/projects/pulse-automation-tools/badge/?version=latest' alt='Documentation Status' />
+</a>
+<a href='http://travis-ci.org/pulse-project/pulse.svg?branch=master'>
+    <img src='http://travis-ci.org/pulse-project/pulse.svg?branch=master' alt='Compilation Status' />
+</a>
+
+This repository is the place where you will find **Directory Server** and **Pulse** projects.
+Both share the same framework: **IT Infrastructure Management Software**, this is why you have to install the core part first.
 
 Read INSTALL files of each project for installation instructions.
+
+Documentation : http://pulse-automation-tools.readthedocs.org/
+
+IRC Chat
+
+You can start a conversation with our comunity here. If you have any problem, or any question, do not hesitate! We are friendly.
+
+server : irc.freenode.net
+channel : #pulse-fr, #pulse-en

core/agent/init/mmc-agent.in

@@ -31,7 +31,7 @@
 # description: MMC agent
 
 # Variables
-DESC="Mandriva Management Console : mmc-agent"
+DESC="Management Console : mmc-agent"
 DAEMON="@sbindir@/mmc-agent"
 PIDFILE="@localstatedir@/run/mmc-agent.pid"
 

core/agent/mmc/core/audit/writers.py

@@ -23,6 +23,8 @@
 """
 Contains singleton classes that writes to the audit backend
 """
+# standard modules
+import time
 
 import socket
 import sys
@@ -360,6 +362,7 @@ def _initTablesmysqlV2(self):
         """
         Init MySQL table for audit database version 2
         """
+        nowsystem = time.strftime("%Y-%m-%d %H:%M:%S")
         self.module_table = Table("module", self.metadata,
                             Column("id", Integer, primary_key=True),
                             Column("name", String(15), nullable=False),
@@ -431,7 +434,7 @@ def _initTablesmysqlV2(self):
 
         self.record_table=Table("record", self.metadata,
                             Column("id", Integer, primary_key=True),
-                            Column("date", DateTime , default=func.now(), nullable=False),
+                            Column("date", DateTime , default=nowsystem, nullable=False),
                             Column("result", Boolean, nullable=False),
                             Column("initiator_id", Integer, ForeignKey('initiator.id'), nullable=False),
                             Column("source_id", Integer, ForeignKey('source.id'), nullable=False),
@@ -446,6 +449,7 @@ def _initTablespostgresV2(self):
         FIXME: to check
         PostgreSQL db tables for audit database version 2
         """
+        nowsystem = time.strftime("%Y-%m-%d %H:%M:%S")
         self.module_table = Table("module", self.metadata,
                             Column("id", Integer, primary_key=True),
                             Column("name", String(15), nullable=False)
@@ -507,7 +511,7 @@ def _initTablespostgresV2(self):
 
         self.record_table=Table("record", self.metadata,
                              Column("id", Integer, primary_key=True),
-                             Column("date", DateTime, default=func.now(), nullable=False),
+                             Column("date", DateTime, default=nowsystem, nullable=False),
                              Column("result", Boolean, nullable=False),
                              Column("initiator_id", Integer, ForeignKey('initiator.id'), nullable=False),
                              Column("source_id", Integer, ForeignKey('source.id')),

core/agent/mmc/database/database_helper.py

@@ -33,7 +33,10 @@
 from sqlalchemy import func
 from sqlalchemy.orm import sessionmaker, Query
 from sqlalchemy.exc import NoSuchTableError
-from sqlalchemy.orm.util import _entity_descriptor
+try:
+    from sqlalchemy.orm.util import _entity_descriptor
+except ImportError:
+    from sqlalchemy.orm.base import _entity_descriptor
 
 Session = sessionmaker()
 logger = logging.getLogger()

core/agent/mmc/database/sqlalchemy_tests.py

@@ -20,15 +20,16 @@
 # along with Pulse 2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA.
-
+from distutils.version import StrictVersion
 from sqlalchemy import __version__
 
 MIN_VERSION = '0.6.3' # Debian Squeeze version
-MAX_VERSION = '0.7.9' # Debian Jessie version
+MAX_VERSION = '0.9.8' # Debian Jessie version
 CUR_VERSION = __version__
 
 def checkSqlalchemy():
-    if MIN_VERSION <= CUR_VERSION <= MAX_VERSION:
+    #if MIN_VERSION <= CUR_VERSION <= MAX_VERSION:
+    if StrictVersion(MIN_VERSION) <= StrictVersion(CUR_VERSION) <=  StrictVersion(MAX_VERSION) :
         return True
     else:
         return False

core/agent/mmc/plugins/base/__init__.py

@@ -2376,7 +2376,7 @@ def getRestrictedComputersListLen(self, ctx, filt):
         """
         return len(self.getComputersList(filt))
 
-    def getRestrictedComputersList(self, ctx, min, max, filt, advanced):
+    def getRestrictedComputersList(self, ctx, min, max, filt, advanced, justid):
         """
         we can't do that directly in ldap, so we do it in python, just to return less xml...
         """
@@ -2563,9 +2563,9 @@ def getRestrictedComputersListLen(self, filt = None):
         ctx = self.currentContext
         return xmlrpcCleanup(ComputerManager().getRestrictedComputersListLen(ctx, filt))
 
-    def getRestrictedComputersList(self, min = 0, max = -1, filt = None, advanced = True):
+    def getRestrictedComputersList(self, min = 0, max = -1, filt = None, advanced = True, justid=False):
         ctx = self.currentContext
-        return xmlrpcCleanup(ComputerManager().getRestrictedComputersList(ctx, min, max, filt, advanced))
+        return xmlrpcCleanup(ComputerManager().getRestrictedComputersList(ctx, min, max, filt, advanced, justid))
 
     def getComputerCount(self, filt = {}):
         ctx = self.currentContext

core/agent/mmc/plugins/base/externalldap.py

@@ -169,13 +169,18 @@ def readConf(self):
                 if option.startswith(PROFILEACL):
                     self.profilesAcl[option.replace(PROFILEACL, "").lower()] = self.get(self.section, option)
 
+            PROFILEENTITY = 'profile_entity_'
+            for option in self.options(self.section):
+                if option.startswith(PROFILEENTITY):
+                    self.profilesEntity[option.replace(PROFILEENTITY, '').lower()] = self.get(self.section, option)
+
     def setDefault(self):
         ProvisionerConfig.setDefault(self)
         self.profileAttr = None
         self.profilesAcl = {}
         self.profileGroupMapping = False
         self.profileGroupPrefix = ""
-
+        self.profilesEntity = {}
 
 class ExternalLdapProvisioner(ProvisionerI):
     """
@@ -206,6 +211,58 @@ def doProvisioning(self, authtoken):
                 self.logger.info("No profile information for user %s in attribute %s" % (uid, self.config.profileAttr))
                 profile = ""
             profile = profile.strip()
+
+            try:
+                entities = self.config.profilesEntity[profile].split()
+                self.logger.info("*******ENTITE '%s' " % (entities))
+            except KeyError:
+                if self.config.profilesEntity.has_key("default"):
+                    entities = self.config.profilesEntity["default"].split()
+                    self.logger.info("Set the default profile to user.")
+                    profile = 'default'
+                else:
+                    self.logger.info("No entity defined in configuration file for profile '%s'" % profile)
+                    self.logger.info("Setting user's entity to empty")
+                    entities = []
+            if profile and entities:
+                tmp = []
+                for entity in entities:
+                    if entity.startswith('%') and entity.endswith('%'):
+                        attr = entity.strip('%')
+                        if attr in userentry:
+                            tmp.extend(userentry[attr])
+                        else:
+                            self.logger.info("The user '%s' doesn't have an attribute '%s'" % (uid, attr))
+
+                    elif entity.startswith('plugin:'):
+                        plugin = entity.replace('plugin:', '')
+                        searchpath = os.path.join(os.path.dirname(__file__), 'provisioning_plugins')
+                        try:
+                            f, p, d = imp.find_module(plugin, [searchpath])
+                            mod = imp.load_module(plugin, f, p, d)
+                            klass = mod.PluginEntities
+                            found = klass().get(authtoken)
+                            if found:
+                                self.logger.info("Plugin '%s' found these entities: %s" % (plugin, found))
+                            else:
+                                self.logger.info("Plugin '%s' found no matching entity" % plugin)
+                            tmp.extend(found)
+                        except ImportError:
+                            self.logger.error("The plugin '%s' can't be imported" % plugin)
+                        except Exception, e:
+                            self.logger.error("Error while using the plugin '%s'" % plugin)
+                            self.logger.exception(e)
+
+
+
+                    else:
+                        tmp.append(entity)
+                entities = tmp[:]
+                self.logger.info("****Setting user '%s' entities corresponding to user profile '%s': %s" % (uid, profile, str(entities)))
+                from pulse2.database.inventory import Inventory
+                Inventory().setUserEntities(uid, entities)
+
+
             try:
                 acls = self.config.profilesAcl[profile]
             except KeyError:

core/web/forgotpassword.php

@@ -28,10 +28,10 @@
 
 ?>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
 <html>
 <head>
-	<title>Mandriva Linux / Mandriva Management Console / Reset Password</title>
+	<title>Siveo Pulse</title>
 	<link href="<?php echo $root; ?>graph/login/index.css" rel="stylesheet" media="screen" type="text/css" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="imagetoolbar" content="false" />

core/web/graph/bootstrap-alerts.css

@@ -9,14 +9,13 @@
  */
 .alert {
   padding: 8px 35px 8px 14px;
-  margin-bottom: 10px;
-  margin-top: 10px;
+  margin:10px 0px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   background-color: #fcf8e3;
   border: 1px solid #fbeed5;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
   color: #c09853;
   font-size: 12px;
 }
@@ -36,10 +35,12 @@
 }
 .alert-danger,
 .alert-error {
-  background-color: #f2dede;
+  /*background-color: #f2dede;*/
+  background-color: #f9efef;
   border-color: #eed3d7;
   color: #b94a48;
 }
+
 .alert-info {
   background-color: #d9edf7;
   border-color: #bce8f1;