Fix some problem

controllers/googleapi.ctrl.php

@@ -33,7 +33,7 @@ class GoogleAPIController extends Controller{
 	/*
 	 * contructor
 	 */
-	function GoogleAPIController() {
+    function __construct() {
 		parent::__construct();
 		$this->tokenCtrler = new UserTokenController();
 	}

controllers/report.ctrl.php

@@ -608,8 +608,8 @@ function generateReports( $searchInfo='' ) {
 			if(empty($this->seFound)){
 				echo "<p class='note notefailed'>".$_SESSION['text']['common']['Keyword']." <b>{$keywordInfo['name']}</b> ".$this->spTextKeyword['not assigned to required search engines']."........</p>";
 			}
-			sleep(SP_CRAWL_DELAY);
-		}	
+			sleep(SP_CRAWL_DELAY);
+		}	
 	}
 
 	# function to format pagecontent
@@ -804,7 +804,7 @@ function crawlKeyword( $keywordInfo, $seId='', $cron=false, $removeDuplicate=tru
 
 		}
 
-		return  $crawlResult;
+		return  $crawlResult;
 	}
 
 	# func to save the report
@@ -1247,7 +1247,10 @@ function showOverallReportSummary($searchInfo='', $cronUserId=false) {
 
 		# website search report section
 		if (empty($searchInfo['report_type']) || in_array($searchInfo['report_type'], array('social-media-reports', 'website-search-reports', 'keyword-search-reports', 'sitemap-reports')) ) {
-			$webMasterCtrler = new WebMasterController();
+
+            include_once(SP_CTRLPATH."/social_media.ctrl.php");
+
+		    $webMasterCtrler = new WebMasterController();
 			$socialMediaCtrler = New SocialMediaController();
 			$webMasterCtrler->set('spTextTools', $this->spTextTools);
 			$webMasterCtrler->spTextTools = $this->spTextTools;
@@ -1357,7 +1360,7 @@ function updateUserReportSetting($userId, $col, $val) {
 	function updateUserReportGenerationLogs($userId, $generateDate) {
 		$dataList = array(
 			'user_id|int' => $userId,
-			'report_date' => $generateDate,
+			'report_date' => $generateDate,
 		);
 
 		$this->dbHelper->insertRow("user_report_logs", $dataList);
@@ -1419,11 +1422,11 @@ function isGenerateReportsForUser($userId) {
     		    // if monthly interval generate on first of each month
     		    if ($repSetInfo['report_interval'] == 30) {
     		        $genReport = (date('d') == 1) ? true : false;
-    		    } else {		    
+    		    } else {
         			$nextGenTime = $lastGeneratedTime + ( $repSetInfo['report_interval'] * 86400);
-        			$genReport = (mktime() > $nextGenTime) ? true : false;
-    		    }    
-		    }		    
+        			$genReport = (time() > $nextGenTime) ? true : false;
+    		    }
+		    }
 		}
 		$repSetInfo['generate_report'] = $genReport; 
 		return $repSetInfo;

controllers/user-type.ctrl.php

@@ -34,8 +34,8 @@ class UserTypeController extends Controller {
 	/**
 	 * constructor
 	 */
-	function UserTypeController() {
-    	
+    function __construct() {
+
     	// call parent constructor
     	parent::__construct();
 

controllers/webmaster.ctrl.php

@@ -30,7 +30,7 @@ class WebMasterController extends GoogleAPIController {
 	var $sourceList = array('google');
 	var $colList = array();	
 
-	function WebMasterController() {
+    function __construct() {
 		parent::__construct();
 
 		$this->spTextWB = $this->getLanguageTexts('webmaster', $_SESSION['lang_code']);

controllers/website.ctrl.php

@@ -24,9 +24,10 @@
 class WebsiteController extends Controller{
 
 	# func to show websites
-	function listWebsites($info=''){		
+	function listWebsites($info=''){
 
-		$userId = isLoggedIn();		
+		$userId = isLoggedIn();
+        if( isset($info['pageno']) ) {} else { $info['pageno'] = 0; }
 		$info['pageno'] = intval($info['pageno']);
 		$pageScriptPath = 'websites.php?stscheck=';
 		$pageScriptPath .= isset($info['stscheck']) ? $info['stscheck'] : "select";

libs/captcha.class.php

@@ -86,12 +86,8 @@ class PhpCaptcha {
       var $bUseColour;
       var $sFileType;
       var $sCode = '';
-
-      function PhpCaptcha(
-         $aFonts, // array of TrueType fonts to use - specify full path
-         $iWidth = CAPTCHA_WIDTH, // width of image
-         $iHeight = CAPTCHA_HEIGHT // height of image
-      ) {
+
+      function __construct($aFonts,$iWidth = CAPTCHA_WIDTH,$iHeight = CAPTCHA_HEIGHT) {
          // get parameters
          $this->aFonts = $aFonts;
          $this->SetNumChars(CAPTCHA_NUM_CHARS);
@@ -476,15 +472,16 @@ function Create() {
          @unlink("$this->sAudioPath$sFile.wav");
       }
    }
-   
+
    // example sub class
    class PhpCaptchaColour extends PhpCaptcha {
-      function PhpCaptchaColour($aFonts, $iWidth = CAPTCHA_WIDTH, $iHeight = CAPTCHA_HEIGHT) {
+      function __construct($aFonts, $iWidth = CAPTCHA_WIDTH, $iHeight = CAPTCHA_HEIGHT) {
          // call parent constructor
          parent::PhpCaptcha($aFonts, $iWidth, $iHeight);
 
          // set options
          $this->UseColour(true);
       }
    }
-?>
+
+?>

libs/controller.class.php

@@ -32,8 +32,8 @@ class Controller extends Seopanel{
 	var $layout = 'default';
 	var $sessionCats = array('common','login','button','label');
 
-	function Controller(){
-		
+    function __construct() {
+
 		# create database object
 		$dbObj = New Database(DB_ENGINE);
 		$this->dbHelper = $dbObj;

libs/database.class.php

@@ -27,7 +27,7 @@ class Database{
 	var $dbConObj;
 
     # constructor
-    function database($dbEngine='mysql'){
+    function __construct($dbEngine='mysql') {
 
     	// if db engine is mysql
     	if ($dbEngine == 'mysql') {

libs/google-api-php-client/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php

@@ -64,7 +64,7 @@ public function release(EasyHandle $easy)
         $resource = $easy->handle;
         unset($easy->handle);
 
-        if (count($this->handles) >= $this->maxHandles) {
+        if ( $this->handles && ( count($this->handles) >= $this->maxHandles ) ) {
             curl_close($resource);
         } else {
             // Remove all callback functions as they can hold onto references

libs/mysqlihelper/mysqlihelper.class.php

@@ -56,6 +56,20 @@ function MysqliHelper($dbServer, $dbUser, $dbPassword, $dbName, $debug){
 
 	// func to execute a select query
 	function select($query, $fetchFirst = false){
+
+        $dbName = DB_NAME;
+        $dbUser = DB_USER;
+        $dbPassword = DB_PASSWORD;
+        $dbServer = DB_HOST;
+
+        if( $this->connectionId ) {
+            if( @mysqli_ping($this->connectionId) ) {} else {
+                $this->connectionId = @mysqli_connect($dbServer, $dbUser, $dbPassword, $dbName);
+            }
+        } else {
+            $this->connectionId = @mysqli_connect($dbServer, $dbUser, $dbPassword, $dbName);
+        }
+
 		$res = mysqli_query($this->connectionId, $query);
 		$this->showError();
 
@@ -79,6 +93,20 @@ function select($query, $fetchFirst = false){
 
 	// func to Execute a general mysql query
 	function query($query, $noRows=false){
+
+        $dbName = DB_NAME;
+        $dbUser = DB_USER;
+        $dbPassword = DB_PASSWORD;
+        $dbServer = DB_HOST;
+
+        if( $this->connectionId ) {
+            if( @mysqli_ping($this->connectionId) ) {} else {
+                $this->connectionId = @mysqli_connect($dbServer, $dbUser, $dbPassword, $dbName);
+            }
+        } else {
+            $this->connectionId = @mysqli_connect($dbServer, $dbUser, $dbPassword, $dbName);
+        }
+
 		$res = @mysqli_query($this->connectionId, $query);
 
 		if ($res){

libs/pchart.class.php

@@ -144,8 +144,7 @@ class pChart
    var $AntialiasQuality = 10;
 
    /* This function create the background picture */
-   function pChart($XSize,$YSize)
-    {
+   function __construct($XSize,$YSize) {
      $this->XSize   = $XSize;
      $this->YSize   = $YSize;
      $this->Picture = imagecreatetruecolor($XSize,$YSize);

libs/pdata.class.php

@@ -49,8 +49,7 @@ class pData
    var $Data;
    var $DataDescription;
 
-   function pData()
-    {
+   function __construct() {
      $this->Data                           = "";
      $this->DataDescription                = "";
      $this->DataDescription["Position"]    = "Name";

libs/spider.class.php

@@ -44,9 +44,9 @@ class Spider{
 	var $_CURL_HTTPHEADER = array();
 	var $userAgentList = array();
 	var $effectiveUrl = null;
-	
+
 	# spider constructor
-	function Spider()	{			
+    function __construct() {
 		$this -> _CURLOPT_COOKIEJAR = SP_TMPPATH.'/'.$this -> _CURLOPT_COOKIEJAR;
 		$this -> _CURLOPT_COOKIEFILE = SP_TMPPATH.'/'.$this -> _CURLOPT_COOKIEFILE;		
 		$this -> _CURL_RESOURCE = curl_init( );
@@ -60,9 +60,8 @@ function Spider()	{
 		$this->userAgentList[] = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.0; search bar)";
 		$this->userAgentList[] = "Mozilla/5.0 (Windows; U; MSIE 9.0; WIndows NT 9.0; en-US))";
 		$this->userAgentList[] = defined('SP_USER_AGENT') ? SP_USER_AGENT : $this->_CURLOPT_USERAGENT;
-
-	}	
-
+	}
+
 	# func to format urls
 	public static function formatUrl($url){	    
 	    $scheme = "";
@@ -103,7 +102,7 @@ function getPageInfo($url, $domainUrl, $returnUrls=false){
 		$ret = $this->getContent($urlWithTrailingSlash);
 		$pageInfo = array(
 			'external' => 0,
-			'total_links' => 0,
+			'total_links' => 0,
 		);
 
 		$checkUrl = formatUrl($domainUrl);
@@ -403,7 +402,7 @@ function debugRunTime($ret) {
 		}
 
 	}
-	
+
 	# func to get session id
 	function getSessionId($page){
 		if (preg_match('/PHPSESSID=(.*?);/', $page, $result)) {
@@ -412,7 +411,7 @@ function getSessionId($page){
 			return false;
 		}
 	}
-	
+
 	# func to check proxy 
 	function checkProxy($proxyInfo) {
 
@@ -494,7 +493,7 @@ public static function getHeader($url, $followRedirects = true){
 		curl_close ($ch);
 		return $content;
 	}
-	
+
 	// function to check whether link is brocke
 	public static function isLInkBrocken($url) {
 	    $header = Spider::getHeader($url);
@@ -504,16 +503,18 @@ public static function isLInkBrocken($url) {
 	        return 0; 
 	    }
 	}
-	
+
 	// function to check whether link is a redirect
 	public static function isLinkRedirect($url) {
 			$followRedirects = false; //don't follow with cURL as we need that info.
-			$header = $this->getHeader($url, $followRedirects);
+			$header = Spider::getHeader($url, $followRedirects);
 			if (stristr($header, '301 Moved Permanently') || stristr($header, '308 Permanent Redirect')) {
 					return true;
 			} else {
 					return 0;
 			}
 	}
+
 }
-?>
+
+?>

libs/validation.class.php

@@ -25,7 +25,7 @@ class Validation{
 
 	var $flagErr;
 
-	function Validation(){
+    function __construct() {
 		$this->Filters['email'] = "/^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i" ;
 		$this->Filters['number'] = "/^[0-9]+$/";
 		$this->Filters['floatnumber'] = "/^\d+$|^\d+\.\d+$|^\.\d+$|^\-\d+$/";

libs/xmlparser.class.php

@@ -53,8 +53,8 @@ class XMLParser{
     /**
      * The class constructor.
      */
-   function XMLParser(){ }
-  
+   function __construct() {}
+
 
     /**
      * parse the XML file (or URL)

themes/classic/views/website/list.ctp.php

@@ -1,6 +1,7 @@
 <form name="listform" id="listform">
 <?php echo showSectionHead($spTextPanel['Website Manager']); ?>
-<?php $submitLink = "scriptDoLoadPost('websites.php', 'listform', 'content')";?>
+<?php $submitLink = "scriptDoLoadPost('websites.php', 'listform', 'content')"; ?>
+<?php if( isset($info['search_name']) ) {} else { $info['search_name'] = ''; } ?>
 <table width="80%" border="0" cellspacing="0" cellpadding="0" class="search">
 	<tr>
 		<th><?php echo $spText['common']['Name']?>: </th>