fixed some stuff

phpList · Nov 8, 2016 · 77ab9f4 · 77ab9f4
1 parent aa9a6b4
commit 77ab9f4
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/plugins/restapi2/call.php b/plugins/restapi2/call.php
@@ -15,7 +15,7 @@
     (! isset( $GLOBALS['DEBUG'] ) || $GLOBALS['DEBUG'] == 0)
     && function_exists( 'xdebug_disable' )
 ) {
-    xdebug_disable();
+    //xdebug_disable();
 }
 
 // Check that the plugin has been initiatlised

diff --git a/plugins/restapi2/lib/Admin.php b/plugins/restapi2/lib/Admin.php
@@ -39,6 +39,7 @@ public function login( $password, $username )
 
         if($data['result']){
             $this->admin->setLoginToken($data['admin']->id);
+            return $this->admin->getLoginToken($data['admin']->id);
         }
     }
 

diff --git a/plugins/restapi2/lib/Handler/LoginHandler.php b/plugins/restapi2/lib/Handler/LoginHandler.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Rapi\Handler;
+use phpList\helper\Logger;
 
 /**
  * Class LoginHandler
@@ -13,14 +14,24 @@ class LoginHandler
      * LoginHandler constructor.
      * @param \Rapi\Admin $admin
      */
-    public function __construct( \Rapi\Admin $admin)
+    public function __construct( \Rapi\Admin $admin, Logger $logger)
     {
         $this->admin = $admin;
+        $logger->debug('LoginHandler was called');
     }
 
     public function login($username, $password){
-        $response = $this->admin->login($username, $password);
-        return ["message" => "Success"];
+        $data = $this->admin->login($username, $password);
+        if($data){
+            return [
+                "message" => "Success",
+                "token" => $data
+            ];
+        }else{
+            return [
+                "message" => "Failure"
+            ];
+        }
     }
 
 }
diff --git a/plugins/restapi2/phplist4-bootstrap.php b/plugins/restapi2/phplist4-bootstrap.php
@@ -12,4 +12,14 @@
 $pl4Config->setRunningConfig( 'TABLE_PREFIX', $GLOBALS['table_prefix'] );
 $pl4Config->setRunningConfig( 'USERTABLE_PREFIX', $GLOBALS['usertable_prefix'] );
 // FIXME: Set this hashing algo from phpList3's config instead
-$pl4Config->setRunningConfig( 'ENCRYPTION_ALGO', 'md5' );
+// Fixed: on PHPList 3 we were using constants with define().
+$pl4Config->setRunningConfig( 'ENCRYPTION_ALGO', ENCRYPTION_ALGO );
+
+// Set the folder where the log file should live
+$pl4Config->setRunningConfig( 'LOG_FOLDER', '/tmp/');
+$pl4Config->setRunningConfig( 'LOG_FILENAME', 'phplist-fork.log');
+
+/**
+ * file | database
+ */
+$pl4Config->setRunningConfig( 'LOG_WRITER',  'file');
diff --git a/plugins/restapi2/services.yml b/plugins/restapi2/services.yml
@@ -33,7 +33,7 @@ services:
     arguments: [@ListEntity, @ListManager, @SubscriberEntity]
   LoginHandler:
     class:     Rapi\Handler\LoginHandler
-    arguments: [@Admin]
+    arguments: [@Admin, @Logger]
 
 # It seems order matters; hence Call{} definition goes last, not alphabetically
   Call:
@@ -44,8 +44,12 @@ services:
   AdminService:
     class: phpList\Admin
     arguments: [@AdminModel, @Pass]
+  LoggerWriterAbstractFactory:
+      class: phpList\helper\Logger\LoggerWriterAbstractFactory
+      arguments: [@Config]
   Logger:
     class: phpList\helper\Logger
+    arguments: [@LoggerWriterAbstractFactory]
   Util:
     class: phpList\helper\Util
     arguments: [@Config, @Logger]