Merge pull request coral-erm#641 from jeffnm/2020.02_installer

2020.02 installer components
wc-library · Mar 25, 2020 · dea1c6a · dea1c6a
2 parents e9315b8 + 6811f67
commit dea1c6a
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 3 deletions.
diff --git a/auth/install/auth.php b/auth/install/auth.php
@@ -350,6 +350,16 @@ function register_auth_provider()
                 }
             ];
 
+        case "2020.02":
+            return [
+                "function" => function($shared_module_info) {
+                    $return = new stdClass();
+                    $return->yield = new stdClass();
+                    $return->success = true;
+                    $return->yield->title = _("Auth Module");
+                    return $return;
+                }
+            ];
 
 
 				/**

diff --git a/install/index.php b/install/index.php
@@ -57,8 +57,8 @@
  *
  * NOTE: It is assumed that version strings can be understood by php's version_compare function
  */
-$INSTALLATION_VERSION = "3.0.1";
-$INSTALLATION_VERSIONS = ["1.9.0", "2.0.0", "3.0.0", "3.0.1"];
+$INSTALLATION_VERSION = "2020.02";
+$INSTALLATION_VERSIONS = ["1.9.0", "2.0.0", "3.0.0", "3.0.1", "2020.02"];
 
 function make_sure_template_is_drawn()
 {

diff --git a/licensing/install/licensing.php b/licensing/install/licensing.php
@@ -198,6 +198,16 @@ function register_licensing_provider()
                 }
             ];
 
+        case "2020.02":
+          return [
+              "function" => function($shared_module_info) {
+                  $return = new stdClass();
+                  $return->yield = new stdClass();
+                  $return->success = true;
+                  $return->yield->title = _("Licensing Module");
+                  return $return;
+              }
+          ];
 				/**
 				 * This code is for when the upgrade requires no changes to the
 				 * database or conf files etc.

diff --git a/management/install/management.php b/management/install/management.php
@@ -110,6 +110,17 @@ function register_management_provider()
                 }
             ];
         case "3.0.1":
+            return [
+                "function" => function($shared_module_info) {
+                    $return = new stdClass();
+                    $return->yield = new stdClass();
+                    $return->success = true;
+                    $return->yield->title = _("Management Module");
+                    return $return;
+                }
+            ];
+
+          case "2020.02":
             return [
                 "function" => function($shared_module_info) {
                     $return = new stdClass();

diff --git a/organizations/install/organizations.php b/organizations/install/organizations.php
@@ -142,6 +142,40 @@ function register_organizations_provider()
                     $return->yield = new stdClass();
                     $return->success = true;
                     $return->yield->title = _("Organizations Module");
+                    return $return;
+                }
+            ];
+
+          case "2020.02":
+             $conf_data = parse_ini_file($protected_module_data["config_file_path"], true);
+             return [
+                "dependencies_array" => [ "db_tools", "have_read_write_access_to_config" ],
+                "sharedInfo" => [
+                    "config_file" => [
+                        "path" => $protected_module_data["config_file_path"],
+                    ],
+                    "database_name" => $conf_data["database"]["name"]
+                ],
+                "function" => function($shared_module_info) use ($MODULE_VARS, $protected_module_data, $version) {
+                    $return = new stdClass();
+                    $return->success = true;
+                    $return->yield = new stdClass();
+                    $return->yield->title = _("Organizations Module");
+                    $return->yield->messages = [];
+
+                    $conf_data = parse_ini_file($protected_module_data["config_file_path"], true);
+
+                    // Process sql files
+                    $db_name = $conf_data["database"]["name"];
+                    $dbconnection = $shared_module_info["provided"]["get_db_connection"]( $db_name );
+                    $ret = $shared_module_info["provided"]["process_sql_files"]( $dbconnection, $version, $MODULE_VARS["uid"] );
+                    if (!$ret["success"])
+                    {
+                        $return->success = false;
+                        $return->yield->messages = array_merge($return->yield->messages, $ret["messages"]);
+                        return $return;
+                    }
+
                     return $return;
                 }
             ];

diff --git a/...tions/install/protected/3.0.2/001-552.sql → ...ons/install/protected/2020.02/001-552.sql b/...tions/install/protected/3.0.2/001-552.sql → ...ons/install/protected/2020.02/001-552.sql
diff --git a/reports/install/reports.php b/reports/install/reports.php
@@ -115,8 +115,18 @@ function register_reports_provider()
                     $return->yield->title = _("Reports Module");
                     return $return;
                 }
-            ];
+              ];
 
+        case "2020.02":
+            return [
+                "function" => function($shared_module_info) {
+                    $return = new stdClass();
+                    $return->yield = new stdClass();
+                    $return->success = true;
+                    $return->yield->title = _("Reports Module");
+                    return $return;
+                }
+            ];
 				default:
 					return null;
 			}

diff --git a/resources/install/resources.php b/resources/install/resources.php
@@ -270,6 +270,18 @@ function register_resources_provider()
               return $return;
             }
           ];
+
+       case "2020.02":
+            return [
+                "function" => function($shared_module_info) {
+                    $return = new stdClass();
+                    $return->yield = new stdClass();
+                    $return->success = true;
+                    $return->yield->title = _("Resources Module");
+                    return $return;
+                }
+            ];
+
 				default:
 					return null;
 			}

diff --git a/usage/install/usage.php b/usage/install/usage.php
@@ -125,6 +125,7 @@ function register_usage_provider()
                     return $return;
                 }
             ];
+
         case "3.0.1":
             return [
                 "function" => function($shared_module_info) {
@@ -135,6 +136,18 @@ function register_usage_provider()
                     return $return;
                 }
             ];
+
+        case "2020.02":
+            return [
+                "function" => function($shared_module_info) {
+                    $return = new stdClass();
+                    $return->yield = new stdClass();
+                    $return->success = true;
+                    $return->yield->title = _("Usage Module");
+                    return $return;
+                }
+            ];
+
 				default:
 					return null;
 			}