PHP7 code improvements (#1395)

* fix php7 strict code errors * improve code for strict php rules * don't use static veriable as object property
sourcefabric · Jun 21, 2016 · b23cc1f · b23cc1f
1 parent fc6cc8b
commit b23cc1f
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 27 deletions.
diff --git a/newscoop/classes/Image.php b/newscoop/classes/Image.php
@@ -45,7 +45,7 @@ class Image extends DatabaseObject
      *
      * @param int $p_imageId
      */
-    public function Image($p_imageId = null)
+    public function __construct($p_imageId = null)
     {
         parent::DatabaseObject($this->m_columnNames);
         $this->m_data['Id'] = $p_imageId;

diff --git a/newscoop/classes/SaaS.php b/newscoop/classes/SaaS.php
@@ -42,8 +42,8 @@ public static function singleton()
      */
     public function hasPermission($p_permissionString)
     {
-        if (array_key_exists('permissions', $this->saasConfig)) {
-            $permissions = $this->saasConfig['permissions'];
+        if (array_key_exists('permissions', self::$saasConfig)) {
+            $permissions = self::$saasConfig['permissions'];
         } else {
             $permissions = array();
         }
@@ -73,7 +73,7 @@ public function hasPrivilege($p_resourceName = null, $p_privilegeName)
 
         $hasPrivilege = TRUE;
         if (array_key_exists('privileges', self::$saasConfig)) {
-            $privileges = $this->saasConfig['privileges'];
+            $privileges = self::$saasConfig['privileges'];
         } else {
             $privileges = array();
         }
@@ -102,7 +102,7 @@ public function filterPrivileges($p_resourceName = null, $p_privilegeName = null
     {
         $returnArray = array();
         if (array_key_exists('privileges', $this->saasConfig)) {
-            $privileges = $this->saasConfig['privileges'];
+            $privileges = self::$saasConfig['privileges'];
         } else {
             $privileges = array();
         }

diff --git a/newscoop/js/tinymce/plugins/campsiteimage/classes/ImageManager.php b/newscoop/js/tinymce/plugins/campsiteimage/classes/ImageManager.php
@@ -31,7 +31,7 @@ class ImageManager
 	 * Constructor. Create a new Image Manager instance.
 	 * @param array $config configuration array, see config.inc.php
 	 */
-	function ImageManager($config)
+	function __construct($config)
 	{
 		$this->config = $config;
 	}
@@ -622,4 +622,4 @@ function processNewDir()
 	}
 }
 
-?>
+?>
diff --git a/newscoop/js/tinymce/plugins/campsiteimage/images.php b/newscoop/js/tinymce/plugins/campsiteimage/images.php
@@ -200,9 +200,9 @@ function drawErrorBase(&$manager)
 <html>
 <head>
     <title>Image List</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link href="css/imagelist.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="assets/dialog.js"></script>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link href="/js/tinymce/plugins/campsiteimage/css/imagelist.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" src="/js/tinymce/plugins/campsiteimage/assets/dialog.js"></script>
 <script type="text/javascript">
 /*<![CDATA[*/
 
@@ -282,9 +282,9 @@ function editImage(image)
 
 /*]]>*/
 </script>
-<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-<script type="text/javascript" src="js/campsiteimage.js?v=4.3.2"></script>
-<script type="text/javascript" src="assets/images.js"></script>
+<script type="text/javascript" src="/js/tinymce/tiny_mce_popup.js"></script>
+<script type="text/javascript" src="/js/tinymce/plugins/campsiteimage/js/campsiteimage.js?v=4.3.2"></script>
+<script type="text/javascript" src="/js/tinymce/plugins/campsiteimage/assets/images.js"></script>
 </head>
 
 <body>

diff --git a/newscoop/js/tinymce/plugins/campsiteimage/popup.php b/newscoop/js/tinymce/plugins/campsiteimage/popup.php
@@ -62,10 +62,10 @@
   <title>{#campsiteimage_dlg.title}</title>
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link href="css/campsiteimage.css" rel="stylesheet" type="text/css" />
+  <link href="/js/tinymce/plugins/campsiteimage/css/campsiteimage.css" rel="stylesheet" type="text/css" />
   <script type="text/javascript" src="/js/jquery/jquery-1.7.1.min.js"></script>
   <script type="text/javascript" src="/js/jquery/jquery-ui-1.8.6.custom.min.js"></script>
-  <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+  <script type="text/javascript" src="/js/tinymce/tiny_mce_popup.js"></script>
   <script type="text/javascript">
   <?php
     require_once($GLOBALS['g_campsiteDir']."/$ADMIN_DIR/media-archive/editor_load_tinymce.php");
@@ -77,10 +77,10 @@
       var captionsEnabled = false;
   <?php } ?>
   </script>
-  <script type="text/javascript" src="js/campsiteimage.js?v=4.3.2"></script>
-  <script type="text/javascript" src="assets/popup.js"></script>
-  <script type="text/javascript" src="assets/dialog.js"></script>
-  <script type="text/javascript" src="assets/manager.js"></script>
+  <script type="text/javascript" src="/js/tinymce/plugins/campsiteimage/js/campsiteimage.js?v=4.3.2"></script>
+  <script type="text/javascript" src="/js/tinymce/plugins/campsiteimage/assets/popup.js"></script>
+  <script type="text/javascript" src="/js/tinymce/plugins/campsiteimage/assets/dialog.js"></script>
+  <script type="text/javascript" src="/js/tinymce/plugins/campsiteimage/assets/manager.js"></script>
 </head>
 <body>
   <form action="images.php" id="uploadForm" method="post" enctype="multipart/form-data" onSubmit="<?php
@@ -90,7 +90,7 @@
 ?>">
   <fieldset>
     <div class="dirs">
-      <iframe src="images.php?article_id=<?php echo $_REQUEST['article_id'] . $imageParams.'&time='.time(); ?>" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
+      <iframe src="/js/tinymce/plugins/campsiteimage/images.php?article_id=<?php echo $_REQUEST['article_id'] . $imageParams.'&time='.time(); ?>" name="imgManager" id="imgManager" class="imageFrame" scrolling="auto" title="Image Selection" frameborder="0"></iframe>
     </div>
   </fieldset>
 

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PreferencesType.php b/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PreferencesType.php
@@ -18,7 +18,8 @@ class PreferencesType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $timeZones = array();
-        array_walk(timezone_identifiers_list(), function ($timeZone) use (&$timeZones) {
+        $timezoneIdentifiers = timezone_identifiers_list();
+        array_walk($timezoneIdentifiers, function ($timeZone) use (&$timeZones) {
             $timeZoneGroup = (strpos($timeZone, '/') !== false) ? substr($timeZone, 0, strpos($timeZone, '/')) : $timeZone;
             $value = (strpos($timeZone, '/') !== false) ? substr($timeZone, strpos($timeZone, '/') + 1) : $timeZone;
             $value = str_replace('_', ' ', $value);

diff --git a/newscoop/template_engine/metaclasses/MetaSubscriptions.php b/newscoop/template_engine/metaclasses/MetaSubscriptions.php
@@ -25,32 +25,47 @@ public function __construct($publicationId, $userId)
         }
     }
 
-    public function has_section($sectionNumber) {
+    public function has_section($sectionNumber)
+    {
         foreach ($this->m_dbObject as $subscription) {
             $subscription = new MetaSubscription($subscription->getSubscriptionId());
-            if($subscription->has_section($sectionNumber) && $subscription->is_active) {
+            if ($subscription->has_section($sectionNumber) && $subscription->is_active) {
                 return $subscription;
             }
         }
 
         return false;
     }
 
-    public function has_article($articleNumber) {
+    public function has_article($articleNumber)
+    {
         foreach ($this->m_dbObject as $subscription) {
             $subscription = new MetaSubscription($subscription->getSubscriptionId());
-            if($subscription->has_article($articleNumber) && $subscription->is_active) {
+            if ($subscription->has_article($articleNumber) && $subscription->is_valid) {
                 return $subscription;
             }
         }
 
         return false;
     }
 
-    public function has_issue($issueNumber) {
+    public function has_issue($issueNumber)
+    {
+        foreach ($this->m_dbObject as $subscription) {
+            $subscription = new MetaSubscription($subscription->getSubscriptionId());
+            if ($subscription->has_issue($issueNumber) && $subscription->is_valid) {
+                return $subscription;
+            }
+        }
+
+        return false;
+    }
+
+    public function has_publication($publicationId)
+    {
         foreach ($this->m_dbObject as $subscription) {
             $subscription = new MetaSubscription($subscription->getSubscriptionId());
-            if($subscription->has_issue($issueNumber) && $subscription->is_active) {
+            if ($subscription->publication->identifier == $publicationId && $subscription->is_valid) {
                 return $subscription;
             }
         }