Merge pull request #143 from seopanel/develop

Seo panel 4.1.0

README

@@ -12,7 +12,6 @@ Requirements
 
         http://php.net/manual/en/curl.setup.php
 
-
 ------------------------------------------
 Installation: Simple 5 minute installation
 ------------------------------------------

admin-panel.php

@@ -60,6 +60,30 @@
 			$info['start_script'] = 'connections.php';
 			$controller->index($info);
 			break;
+
+		case "settings":
+			$info['menu_selected'] = 'settings';
+			$info['start_script'] = 'settings.php';
+			$controller->index($info);
+			break;
+
+		case "moz-settings":
+			$info['menu_selected'] = 'settings';
+			$info['start_script'] = 'settings.php?category=moz';
+			$controller->index($info);
+			break;
+
+		case "google-settings":
+			$info['menu_selected'] = 'settings';
+			$info['start_script'] = 'settings.php?category=google';
+			$controller->index($info);
+			break;
+
+		case "alerts":
+		    $info['menu_selected'] = 'my-profile';
+		    $info['start_script'] = 'alerts.php';
+		    $controller->index($info);
+		    break;
 
 		default:
 			$_GET['sec'] = addslashes($_GET['sec']);

alerts.php

@@ -0,0 +1,77 @@
+<?php
+
+/***************************************************************************
+ *   Copyright (C) 2009-2011 by Geo Varghese(www.seopanel.in)  	   *
+ *   [email protected]   												   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+include_once("includes/sp-load.php");
+include_once(SP_CTRLPATH . "/alerts.ctrl.php");
+
+checkLoggedIn();
+$controller = New AlertController();
+$controller->view->menu = 'alerts';
+$controller->layout = 'ajax';
+$controller->spTextPanel = $controller->getLanguageTexts('panel', $_SESSION['lang_code']);
+$controller->set('spTextPanel', $controller->spTextPanel);
+$controller->spTextMyAccount = $controller->getLanguageTexts('myaccount', $_SESSION['lang_code']);
+$controller->set('spTextMyAccount', $controller->spTextMyAccount);
+
+if($_SERVER['REQUEST_METHOD'] == 'POST'){
+
+    switch($_POST['sec']) {
+
+        case "fetch_alerts":
+            $controller->fetchAlerts($_POST);
+            break;
+
+        case "delete_all_alerts":
+            if (!empty($_POST['ids'])) {
+                foreach($_POST['ids'] as $id) {
+                    $controller->deleteAlert($id);
+                }
+            }
+
+            $controller->listAlerts($_POST);
+            break;
+
+		default:
+		    $controller->listAlerts($_POST);
+			break;
+
+	}
+
+} else {
+
+    switch($_GET['sec']) {
+
+        case "alert_info":
+            $controller->showAlertInfo($_GET['id']);
+            break;
+
+        case "delete_alert":
+            $controller->deleteAlert($_GET['id']);
+            $controller->listAlerts($_GET);
+            break;
+
+		default:			
+			$controller->listAlerts($_GET);
+			break;
+	}	
+}
+?>

analytics.php

@@ -0,0 +1,92 @@
+<?php
+
+/***************************************************************************
+ *   Copyright (C) 2009-2011 by Geo Varghese(www.seopanel.in)  	   *
+ *   [email protected]   												   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+include_once("includes/sp-load.php");
+checkLoggedIn();
+
+// check for access to seo tool
+// isUserHaveAccessToSeoTool("webmaster-tools");
+
+include_once(SP_CTRLPATH."/analytics.ctrl.php");
+$controller = New AnalyticsController();
+$controller->view->menu = 'seotools';
+$controller->layout = 'ajax';
+$controller->spTextTools = $controller->getLanguageTexts('seotools', $_SESSION['lang_code']);
+$controller->set('spTextTools', $controller->spTextTools);
+
+if($_SERVER['REQUEST_METHOD'] == 'POST'){
+
+	switch($_POST['sec']) {
+
+		case "doQuickChecker":
+			$controller->doQuickChecker($_POST);
+			break;
+
+		case "viewAnalyticsSummary":
+		    $controller->viewAnalyticsSummary($_POST);
+		    break;
+
+		case "viewAnalyticsReports":
+		    $controller->viewAnalyticsReports($_POST);
+		    break;
+
+		case "viewAnalyticsGraphReports":
+		    $controller->viewAnalyticsGraphReports($_POST);
+		    break;
+
+		default:
+		    $controller->viewAnalyticsSummary($_POST);
+		    break;
+	}
+
+} else {
+
+	switch($_GET['sec']) {
+
+		case "quickChecker":
+			$controller->viewQuickChecker($_GET);
+			break;
+
+		case "viewAnalyticsSummary":
+		    $controller->viewAnalyticsSummary($_GET);
+		    break;
+
+		case "viewAnalyticsReports":
+		    $controller->viewAnalyticsReports($_GET);
+		    break;
+
+		case "viewAnalyticsGraphReports":
+		    $controller->viewAnalyticsGraphReports($_GET);
+		    break;
+
+		case "source_box":
+		    $controller->showSourceSelectBox($_GET['website_id']);
+		    break;
+
+		default:
+		    $controller->viewAnalyticsSummary($_POST);
+		    break;
+
+	}
+
+}
+?>

config/sp-config-extra.php

@@ -58,7 +58,7 @@
 define('SP_THEMEINFOFILE', 'theme.xml');
 
 # seo panel main site
-define('SP_MAIN_SITE', 'https://www.seopanel.in');
+define('SP_MAIN_SITE', 'https://www.seopanel.org');
 
 # seo panel plugin site info
 define('SP_PLUGINSITE', SP_MAIN_SITE . '/plugins/');
@@ -84,8 +84,11 @@
 # The api language code
 define('SP_API_LANG_CODE', 'en');
 
+# The api language code
+define('SP_CUSTOM_DEV', false);
+
 # The seo panel help page
-define('SP_HELP_LINK', 'http://docs.seopanel.in/');
+define('SP_HELP_LINK', 'https://www.seopanel.org/docs/');
 
 # The seo panel forum page
 define('SP_FORUM_LINK', 'http://forum.seopanel.in/');

config/sp-config-sample.php

@@ -40,7 +40,7 @@
 define('DB_ENGINE', 'mysql');
 
 # The version of seo panel installed
-define('SP_INSTALLED', '4.0.0');
+define('SP_INSTALLED', '4.1.0');
 
 # The DB debug mode
 define('SP_DEBUG', 0);

controllers/adminpanel.ctrl.php

@@ -26,11 +26,17 @@ class AdminPanelController extends Controller{
 	# index function
 	function index($info = ""){
 
-		$menuList[] = array(
+		if (isAdmin() || !SP_CUSTOM_DEV) {
+			$menuList[] = array(
 						'id' => 1,
             			'name' => $this->spTextPanel['Website Manager'],
             			'url_section' => 'websites'						
-						);		
+						);
+		} else {
+			$info['start_script'] = !empty($info['start_script']) ? $info['start_script'] : "archive.php";
+			$info['menu_selected'] = !empty($info['menu_selected']) ? $info['menu_selected'] : "report-manager";
+		}
+
 		if(isAdmin()){
 			$menuList[] = array(
 						'id' => 2,