refs #1835 : modify - PHP 7 strict standards

Needlworks · Dec 9, 2015 · 2384f65 · 2384f65
1 parent e515281
commit 2384f65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/framework/boot/30-Auth.php b/framework/boot/30-Auth.php
@@ -264,11 +264,11 @@ static function authorize($domain, $userid) {
         return;
     }
 
-    function setBasicAcl($userid) {
+    static function setBasicAcl($userid) {
         /* Remain for compatibility */
     }
 
-    function setTeamAcl($userid) {
+    static function setTeamAcl($userid) {
         /* Remain for compatibility */
     }
 
@@ -358,15 +358,15 @@ static function isAvailable($blogid) {
 }
 
 class Auth {
-    function login($loginid, $password) {
+    static function login($loginid, $password) {
         $context = Model_Context::getInstance();
         if (Auth::authenticate($context->getProperty('blog.id'), $loginid, $password, true) === false) {
             return false;
         }
         return true;
     }
 
-    function authenticate($blogid, $loginid, $password, $blogapi = false) {
+    static function authenticate($blogid, $loginid, $password, $blogapi = false) {
         $session = array();
         Acl::clearAcl();
         $pool = DBModel::getInstance();

diff --git a/framework/legacy/Textcube.Model.Paging.php b/framework/legacy/Textcube.Model.Paging.php
@@ -3,7 +3,7 @@
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 class Paging {
-    function init($url, $prefix = '?page=') {
+    static function init($url, $prefix = '?page=') {
         return array('url' => rtrim($url, '?'), 'prefix' => $prefix, 'postfix' => '', 'total' => 0, 'pages' => 0, 'page' => 0, 'before' => array(), 'after' => array());
     }
 
@@ -177,11 +177,11 @@ static function fetch($sqlmodel, $page, $count, $url = null, $prefix = '?page=',
 
     /** Legacy methods **/
 
-    function initPaging($url, $prefix = '?page=') {
+    static function initPaging($url, $prefix = '?page=') {
         return self::init($url, $prefix);
     }
 
-    function fetchWithPaging($sql, $page, $count, $url = null, $prefix = '?page=', $countItem = null, $onclick = null) {
+    static function fetchWithPaging($sql, $page, $count, $url = null, $prefix = '?page=', $countItem = null, $onclick = null) {
         return self::fetch($sql, $page, $count, $url, $prefix, $countItem, $onclick);
     }
 }