Merge pull request #183 in ZP/z-push from feature/ZP-77-systemwide-policy-configuration to develop

* commit 'a647a1bc':
  ZP-77 Add BASE_PATH to the policies file, fixed typo.

src/config.php

@@ -144,7 +144,7 @@
     define('LOOSE_PROVISIONING', false);
 
     // The file containing the policies' settings.
-    define('PROVISIONING_POLICYFILE', 'policies.ini');
+    define('PROVISIONING_POLICYFILE', BASE_PATH . 'policies.ini');
 
     // Default conflict preference
     // Some devices allow to set if the server or PIM (mobile)

src/lib/core/asdevice.php

@@ -63,7 +63,7 @@ class ASDevice extends StateObject {
                                     'lastupdatetime' => 0,
                                     'conversationmode' => false,
                                     'policyhash' => false,
-                                    'policyname' > self::DEFAULTPOLICYNAME,
+                                    'policyname' => self::DEFAULTPOLICYNAME,
                                     'policykey' => self::UNDEFINED,
                                     'forcesave' => false,
                                     'asversion' => false,