Merge pull request #174 from X2Engine/development

Development
X2Engine · Aug 6, 2019 · b60fb5c · b60fb5c
2 parents 8718c36 + 8f84919
commit b60fb5c
Show file tree

Hide file tree

Showing 17 changed files with 814 additions and 279 deletions.
diff --git a/x2engine/LICENSE.txt b/x2engine/LICENSE.txt
diff --git a/x2engine/initialize_ent.php b/x2engine/initialize_ent.php
diff --git a/x2engine/protected/components/UpdaterBehavior.php b/x2engine/protected/components/UpdaterBehavior.php
@@ -1740,7 +1740,7 @@ public function getUpdatePackage() {
      * Base URL of the web server from which to fetch data and files
      */
     public function getUpdateServer() {
-        return X2_UPDATE_BETA ? 'http://beta.x2planet.com' : 'http://52.33.121.218/x2planet.com';
+        return X2_UPDATE_BETA ? 'http://beta.x2planet.com' : 'https://x2planet.com';
     }
 
     public function getVersion() {

diff --git a/x2engine/protected/components/behaviors/ApplicationConfigBehavior.php b/x2engine/protected/components/behaviors/ApplicationConfigBehavior.php
@@ -148,7 +148,7 @@ public function events(){
     }
 
     public function getUpdateServer() {
-        return X2_UPDATE_BETA ? 'http://beta.x2planet.com' : 'http://52.33.121.218/x2planet.com';
+        return X2_UPDATE_BETA ? 'http://beta.x2planet.com' : 'https://x2planet.com';
     }
 
     /**

diff --git a/x2engine/protected/controllers/AdminController.php b/x2engine/protected/controllers/AdminController.php
@@ -623,7 +623,7 @@ public function behaviors() {
             $behaviors = array();
             $maxTries = 3;
             $GithubUrl = 'https://raw.github.com/X2Engine/X2Engine/master/x2engine/protected';
-            $x2planUrl = 'http://52.33.121.218/x2planet.com/updates/x2engine/protected'; // NOT using UpdaterBehavior.updateServer because that behavior may not yet exist
+            $x2planUrl = 'https://x2planet.com/updates/x2engine/protected'; // NOT using UpdaterBehavior.updateServer because that behavior may not yet exist
             $files = array_merge(array_fill_keys(array_keys(self::$behaviorClasses), 'behavior'), array_fill_keys(self::$dependencies, 'dependency'));
             $tryCurl = in_array(ini_get('allow_url_fopen'), array(0, 'Off', 'off'));
             foreach ($files as $class => $type) {
@@ -2834,7 +2834,6 @@ public function actionGoogleIntegration() {
             $params = array('class' => 'GoogleProject');
         }
         $url = Yii::app()->createUrl('/profile/createUpdateCredentials', $params);
-        file_put_contents("/tmp/Justin.txt", CJSON::encode($url));
         $this->redirect($url);
     }
 
@@ -6390,7 +6389,7 @@ public function actionViewLogs() {
     public function missingClassesException($classes) {
         $message = Yii::t('admin', 'One or more dependencies of AdminController are missing and could not be automatically retrieved. They are {classes}', array('{classes}' => implode(', ', $classes)));
         $message .= "\n\n" . Yii::t('admin', 'To diagnose this error, please upload and run the requirements check script on your server.');
-        $message .= "\nhttp://52.33.121.218/x2planet.com/installs/requirements.php";
+        $message .= "\nhttps://x2planet.com/installs/requirements.php";
         $message .= "\n\n" . Yii::t('admin', 'The error is most likely due to one of the following things:');
         $message .= "\n(1) " . Yii::t('admin', 'PHP processes run by the web server do not have permission to create or modify files');
         $message .= "\n(2) " . Yii::t('admin', 'x2planet.com and raw.github.com are currently unavailable');

diff --git a/x2engine/protected/controllers/x2base.php b/x2engine/protected/controllers/x2base.php
@@ -729,7 +729,6 @@ public function render($view,$data=null,$return=false)
         {
 
             $output=$this->renderPartial($view,$data,true);
-            //printR($output, 1);
             /* x2modstart */ 
             if(($layoutFile=$this->getLayoutFile($this->layout))!==false) {
                 $output = $this->renderLayout ($layoutFile, $output);

diff --git a/x2engine/protected/models/X2Model.php b/x2engine/protected/models/X2Model.php
@@ -891,7 +891,6 @@ public function afterDelete() {
      * http://www.yiiframework.com/license/
      */
     public function save($runValidation = true, $attributes = null) {
-        //printR($this->attributes, $die = TRUE);
         if (!$runValidation || $this->validate($attributes)) {
             /* x2modstart */
             if ($this->asa('FlowTriggerBehavior') &&
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,7 +148,7 @@ public function events(){ @@
         }
         public function getUpdateServer() {
-            return X2_UPDATE_BETA ? 'http://beta.x2planet.com' : 'http://52.33.121.218/x2planet.com';
+            return X2_UPDATE_BETA ? 'http://beta.x2planet.com' : 'https://x2planet.com';
         }
         /**
@@ Expand Down @@