Merge pull request #14 from AleksanderKoko/master

fixed String problem on PHP7

Author: samtuke

core/Admin.php

@@ -1,7 +1,7 @@
 <?php
 namespace phpList;
 
-use phpList\helper\String;
+use phpList\helper\StringClass;
 use phpList\helper\Util;
 use phpList\Entity\AdminEntity;
 
@@ -23,7 +23,7 @@ public function __construct( $adminModel, $pass )
      */
     public function setLoginname($loginname)
     {
-        $this->loginname = strtolower(String::normalize($loginname));
+        $this->loginname = strtolower(StringClass::normalize($loginname));
         return $this->isLoginUnique();
     }
 
@@ -34,7 +34,7 @@ public function setLoginname($loginname)
      */
     public function setNamelc($namelc)
     {
-        $this->namelc = strtolower(String::normalize($namelc));
+        $this->namelc = strtolower(StringClass::normalize($namelc));
     }
 
     public $email;
@@ -105,7 +105,7 @@ public static function getAdmins($search = '')
         $admins = array();
         $condition = '';
         if ($search != '') {
-            $search = String::sqlEscape($search);
+            $search = StringClass::sqlEscape($search);
             $condition = sprintf(' WHERE loginname LIKE "%%%s%%" OR email LIKE "%%%s%%"', $search, $search);
         }
 
@@ -159,7 +159,7 @@ public function save()
      */
     public function update($modifiedby)
     {
-        $privileges = String::sqlEscape(serialize($this->privileges));
+        $privileges = StringClass::sqlEscape(serialize($this->privileges));
         phpList::DB()->query(
             sprintf(
                 'UPDATE %s SET

core/Campaign.php

@@ -4,7 +4,7 @@
 use Exception;
 use phpList\Entity\CampaignEntity;
 use phpList\Entity\MailingListEntity;
-use phpList\helper\String;
+use phpList\helper\StringClass;
 use phpList\helper\Util;
 
 class Campaign
@@ -123,7 +123,7 @@ public function getCampaignsBy($status, $subject = '', $owner = 0, $order = '',
         $condition .= ') ';
 
         if ($subject != '') {
-            $condition .= ' AND subject LIKE "%' . String::sqlEscape($subject) . '%" ';
+            $condition .= ' AND subject LIKE "%' . StringClass::sqlEscape($subject) . '%" ';
         }
         if ($owner != 0) {
             $condition .= sprintf(' AND owner = %d', $owner);

core/Model/AdminModel.php

@@ -2,7 +2,7 @@
 namespace phpList\Model;
 
 use phpList\Entity\SubscriberEntity;
-use phpList\helper\String;
+use phpList\helper\StringClass;
 
 class AdminModel {
 

core/Model/ListModel.php

@@ -2,7 +2,7 @@
 namespace phpList\Model;
 
 use phpList\Entity\SubscriberEntity;
-use phpList\helper\String;
+use phpList\helper\StringClass;
 
 class ListModel {
 
@@ -21,6 +21,14 @@ public function __construct( \phplist\Config $config, \phplist\helper\Database $
     */
     public function addSubscriber( $subscriberId, $listId )
     {
+
+        $lists = $this->getListsForSubscriber((int) $subscriberId);
+        foreach ($lists as $list){
+            if((int) $list["id"] === (int) $listId){
+                throw new \Exception("Subscriber is already subscribed on that list");
+            }
+        }
+
         $result = $this->db->query(
             sprintf(
                 'INSERT INTO
@@ -202,7 +210,7 @@ public function getListsForSubscriber( $subscriber_id )
                 , $subscriber_id
             )
         );
-        return $this->makeLists( $result );
+        return $result->fetchAll( \PDO::FETCH_ASSOC );
     }
 
     /**

core/Model/SubscriberModel.php

@@ -2,7 +2,7 @@
 namespace phpList\Model;
 
 use phpList\Entity\SubscriberEntity;
-use phpList\helper\String;
+use phpList\helper\StringClass;
 
 class SubscriberModel {
 
@@ -115,6 +115,19 @@ public function getSubscriberById( $id )
         return $result->fetch( \PDO::FETCH_ASSOC );
     }
 
+    public function getSubscriberByEmail( $emailAddress )
+    {
+        $result = $this->db->query(
+            sprintf(
+                "SELECT * FROM %s
+                WHERE email = '%s'",
+                $this->config->getTableName( 'user', true ),
+                $emailAddress
+            )
+        );
+        return $result->fetch( \PDO::FETCH_ASSOC );
+    }
+
     /**
      * Cleanly delete all records of a subscriber from DB
      * @param  int $id ID of subscriber to delete

core/SubscriberManager.php

@@ -3,7 +3,7 @@
 
 use phpList\Subscriber;
 use phpList\Entity\SubscriberEntity;
-use phpList\helper\String;
+use phpList\helper\StringClass;
 
 class SubscriberManager
 {
@@ -135,6 +135,10 @@ public function add( \phpList\Entity\SubscriberEntity $scrEntity )
             throw new \Exception( 'Cannot insert subscriber with invalid email address: "' . $scrEntity->emailAddress . '"' );
         }
 
+        $entity = $this->subscriberModel->getSubscriberByEmail($scrEntity->emailAddress);
+        if($entity["email"] !== null)
+            throw new \Exception("Subscriber with that email already exists");
+
         // Save subscriber to db
         $newSubscriberId = $this->subscriberModel->save(
             $scrEntity->emailAddress
@@ -177,6 +181,11 @@ public function update( SubscriberEntity $subscriber )
      */
     public function delete( $id )
     {
+
+        $subscriber = $this->subscriberModel->getSubscriberById($id);
+        if(!$subscriber)
+            throw new \Exception("Subscriber doesn't exists");
+
         $results = $this->subscriberModel->delete( $id );
 
         // TODO: Add a check of $results to ensure delete was successful before
@@ -290,7 +299,7 @@ public function getCleanAttributes(SubscriberEntity $scrEntity)
         foreach ($scrEntity->getAttributes() as $key => $val) {
             ## in the help, we only list attributes with "strlen < 20"
             if (strlen($key) < 20) {
-                $clean_attributes[String::cleanAttributeName($key)] = $val;
+                $clean_attributes[StringClass::cleanAttributeName($key)] = $val;
             }
         }
         return $clean_attributes;

core/helper/PrepareCampaign.php

@@ -276,7 +276,7 @@ public static function sendEmail(
 
         if ($cached_campaign->htmlformatted) {
             if (empty($cached_campaign->textcontent)) {
-                $textcontent = String::HTML2Text($content);
+                $textcontent = StringClass::HTML2Text($content);
             } else {
                 $textcontent = $cached_campaign->textcontent;
             }
@@ -1584,7 +1584,7 @@ public static function precacheCampaign($campaign, $forwardContent = false)
         $cached_campaign->footer = $forwardContent ? stripslashes($campaign->forwardfooter) : $campaign->footer;
 
         if (strip_tags($cached_campaign->footer) != $cached_campaign->footer) {
-            $cached_campaign->textfooter = String::HTML2Text($cached_campaign->footer);
+            $cached_campaign->textfooter = StringClass::HTML2Text($cached_campaign->footer);
             $cached_campaign->htmlfooter = $cached_campaign->footer;
         } else {
             $cached_campaign->textfooter = $cached_campaign->footer;
@@ -1644,7 +1644,7 @@ public static function precacheCampaign($campaign, $forwardContent = false)
 
 
         /*if ($cached_campaign->htmlformatted) {
-            #   $cached->content = String::compressContent($cached->content);
+            #   $cached->content = StringClass::compressContent($cached->content);
         }*/
 
         //$cached_campaign->google_track = $campaign->google_track;

core/helper/String.php

@@ -8,7 +8,7 @@
  * Class containing string helper functions
  * @package phpList
  */
-class String
+class StringClass
 {
     /**
      * Normalize text
@@ -121,7 +121,7 @@ public static function HTML2Text($text)
             500
         );
 
-        $text = String::replaceChars($text);
+        $text = StringClass::replaceChars($text);
 
         $text = preg_replace("/###NL###/", "\n", $text);
         $text = preg_replace("/\n /", "\n", $text);

core/helper/Util.php

@@ -610,15 +610,15 @@ public function blacklistEmail($email_address, $reason = '', $date = '')
         } else {
             $sqldate = '"' . $date . '"';
         }
-        $email_address = String::sqlEscape($email_address);
+        $email_address = StringClass::sqlEscape($email_address);
 
         #0012262: blacklist only email when email bounces. (not subscribers): Function split so email can be blacklisted without blacklisting subscriber
         $this->db->query(
             sprintf(
                 'INSERT IGNORE INTO %s (email,added)
                 VALUES("%s",%s)',
                 $this->config->getTableName('user_blacklist'),
-                String::sqlEscape($email_address),
+                StringClass::sqlEscape($email_address),
                 $sqldate
             )
         );
@@ -726,7 +726,7 @@ public function parseEmailAndName($string, $default_address)
 
         return [
             'email' =>  $email_address,
-            'name'  =>  String::removeDoubleSpaces(trim($name))
+            'name'  =>  StringClass::removeDoubleSpaces(trim($name))
         ];
     }
 

core/phpListMailer.php

@@ -1,7 +1,7 @@
 <?php
 namespace phpList;
 
-use phpList\helper\String;
+use phpList\helper\StringClass;
 use phpList\helper\Util;
 use PHPMailer;
 
@@ -685,7 +685,7 @@ public static function constructSystemMail($message, $subject = '')
 
         if ($hasHTML) {
             $message = stripslashes($message);
-            $textmessage = String::HTML2Text($message);
+            $textmessage = StringClass::HTML2Text($message);
             $htmlmessage = $message;
         } else {
             $textmessage = $message;