Changeset 3186 for trunk/engine/ispcp-dmn-mngr

Timestamp:

08/11/10 11:24:56 (22 months ago)

Author:

benedikt

Message:

• [ENGINE] Fixed #2053: Make ispCP ω PHP 5.3 compatible (part II): Added Timezone Variable
• [GUI] Default/Disabled? Page CSS embedded in CDATA tags

Location:

trunk

Files:

• . (modified) (1 prop)
• engine/ispcp-dmn-mngr (modified) (4 diffs)

trunk/engine/ispcp-dmn-mngr

@@ -1547 +1547 @@
         my $pear_dir = $main::cfg{'PEAR_DIR'};
         my $starter_dir = $main::cfg{'PHP_STARTER_DIR'};
+        my $timezone = $main::cfg{'PHP_TIMEZONE'};
         my $conf_dir = $main::cfg{'CONF_DIR'};
         my $httpd_uid = $main::cfg{'APACHE_USER'};
@@ -1790 +1791 @@
                         '{PEAR_DIR}' => $pear_dir,
                         '{WWW_DIR}'  => $www_dir,
-                        '{DMN_NAME}' => $dmn_name
+                        '{DMN_NAME}' => $dmn_name,
+                        '{PHP_TIMEZONE}' => $timezone
                 );
 
@@ -1860 +1862 @@
         my $pear_dir = $main::cfg{'PEAR_DIR'};
         my $starter_dir = $main::cfg{'PHP_STARTER_DIR'};
+        my $timezone = $main::cfg{'PHP_TIMEZONE'};
         my $conf_dir = $main::cfg{'CONF_DIR'};
         my $httpd_uid = $main::cfg{'APACHE_USER'};
@@ -2031 +2034 @@
 
         # php.ini for the domain
-
-        if (! -e "$starter_dir/$dmn_name/php5/php.ini") {
-                my $ini_tpl = undef;
-                my $ini_cfg_dir = "$main::cfg{'CONF_DIR'}/fcgi/parts/php5";
-
-                ($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
-                return $rs if ($rs != 0);
-
-                my %tag_hash = (
+        ########################
+
+        # backup current file if one exist
+        if (-e "$starter_dir/$dmn_name/php5/php.ini") {
+                $rs = sys_command_rs(
+                        "$main::cfg{'CMD_CP'} -p $starter_dir/$dmn_name/php5/php.ini " .
+                        "$conf_dir/fcgi/backup/${dmn_name}.php.ini." . time
+                );
+                return $rs if ($rs != 0);
+
+        }
+
+        ($rs, my $ini_tpl) = get_file("$conf_dir/fcgi/parts/php5/php.ini");
+        return $rs if ($rs != 0);
+
+        ($rs, $cfg) = prep_tpl(
+                {
                         '{PEAR_DIR}' => $pear_dir,
                         '{WWW_DIR}'  => $www_dir,
-                        '{DMN_NAME}' => $dmn_name
-                );
-
-                ($rs, $cfg) = prep_tpl(\%tag_hash, $ini_tpl);
-                return $rs if ($rs != 0);
-
-                ($rs, $rdata) = store_file(
-                        "$starter_dir/$dmn_name/php5/php.ini", $cfg, $sys_user, $sys_group,
-                        0440
-                );
-                return $rs if ($rs != 0);
-        }
+                        '{DMN_NAME}' => $dmn_name,
+                        '{PHP_TIMEZONE}' => $timezone
+                },
+                        $ini_tpl
+        );
+        return $rs if ($rs != 0);
+
+        ($rs, $rdata) = store_file(
+                "$starter_dir/$dmn_name/php5/php.ini", $cfg, $sys_user, $sys_group,
+                0440
+        );
+        return $rs if ($rs != 0);
 
         # php5-fcgi-starter for the domain
-
+        ##################################
         if (! -e "$starter_dir/$dmn_name/php5-fcgi-starter") {
                 my $starter_tpl = undef;