Merge branch 'develop'

.gitignore

@@ -2,9 +2,11 @@
 theme/
 !theme/panel/*
 !theme/blue/*
+!theme/toranj/*
 cache
 uploads
 node_modules/
 package-lock.json
 pinker
 setting/config
+theme/*/setting/config

app.php

@@ -6,15 +6,14 @@
     'name' => 'paper',
     'description' => 'paper is an application for launching magazine, blog, and content websites',
     'icon' => 'icon.png',
-    'version-code' => 9,
-    'version-name' => '2.3',
+    'version-code' => 10,
+    'version-name' => '2.4.8',
     'developer' => 'pinoox',
     'enable' => true,
     'theme' => 'blue',
     'theme-panel' => 'papyrus',
     'lang' => 'fa',
     'service' => [
-        'template',
         'user',
     ],
     'loader' => [

component/helper.class.php

@@ -28,8 +28,6 @@ public static function getLocaleDate($format = null, $date = 'now')
         } else {
             return Date::j($format, $date);
         }
-
-
     }
 
     public static function timePrint($seconds)

controller/api/api.configuration.php

@@ -35,7 +35,7 @@ public function _exception()
         $this->error();
     }
 
-    public function error()
+    protected function error()
     {
         Response::json('not found',404);
     }

controller/api/panel/v1/dashboard.controller.php

@@ -48,6 +48,7 @@ public function getStats()
         $visitStats = StatisticModel::fetch_stats($today);
         $statsProgress = StatisticModel::calc_stats_progress_than_yesterday($visitStats, $yesterday);
         $commentStats = CommentModel::fetch_stats();
+        $contactStats = ContactModel::fetch_stats();
         $words = PostModel::fetch_total_words();
         $timeTracking = $this->getTimeTrackingRound();
 
@@ -56,7 +57,8 @@ public function getStats()
             'timeTracking' => $timeTracking,
             'stats' => $visitStats,
             'progress' => $statsProgress,
-            'commentStats' => $commentStats
+            'commentStats' => $commentStats,
+            'contactStats' => $contactStats,
         ]);
     }
 

controller/api/v1/api.controller.php → controller/api/v1/main.controller.php

@@ -12,12 +12,12 @@
 
 namespace pinoox\app\com_pinoox_paper\controller\api\v1;
 
+use pinoox\app\com_pinoox_paper\model\ContactModel;
 use pinoox\component\Request;
 use pinoox\component\Response;
 use pinoox\component\Validation;
-use pinoox\app\com_pinoox_paper\model\ContactModel;
 
-class ApiController extends MasterConfiguration
+class MainController extends MasterConfiguration
 {
     public function newContact()
     {
@@ -38,5 +38,13 @@ public function newContact()
         Response::jsonMessage(rlang('front.error_happened'), false);
     }
 
+    public function getSetting($section, $key = null)
+    {
+        if ($section == 'developer')
+            self::error();
+
+        $key = !empty($key) ? $section . '.' . $key : $section;
+        Response::json(setting($key));
+    }
 }
 

controller/api/v1/master.configuration.php

@@ -13,13 +13,26 @@
 namespace pinoox\app\com_pinoox_paper\controller\api\v1;
 
 use pinoox\app\com_pinoox_paper\controller\api\ApiConfiguration;
+use pinoox\component\Template;
 
 class MasterConfiguration extends ApiConfiguration
 {
 
     public function __construct()
     {
         parent::__construct();
+        $template = new Template();
+        $api = $template->getMeta('api');
+        if(!$api)
+            self::error();
+    }
+
+    protected function printError($data)
+    {
+    }
+
+    protected function printResult($data)
+    {
     }
 
 }