Changeset 156

Timestamp:

Sep 21, 2003, 8:25:01 PM (21 years ago)

Author:

z0rglub

Message:

Use prefixeTable instead of prefix_table to be compliant with previous
releases

Location:

trunk

Files:

• admin/install.php (modified) (7 diffs)
• template/default/admin/install.vtp (modified) (1 diff)

trunk/admin/install.php

@@ -82 +82 @@
       $file_content.= "\n\$cfgPassword = '". $_POST['cfgPassword']."';";
       $file_content.= "\n\$cfgHote = '".     $_POST['cfgHote']."';";
-      $file_content.= "\n\$prefixeTable = '".$_POST['prefix_table']."';";
+      $file_content.= "\n\$prefixeTable = '".$_POST['prefixeTable']."';";
       $file_content.= "\n?>";
       // writting the configuration file
@@ -154 +154 @@
     // base
     $vtp->setVar( $handle, 'step1.f_base', $_POST['cfgBase'] );
-    // prefix_table
-    if ( !isset( $_POST['prefix_table'] ) )
-      $vtp->setVar( $handle, 'step1.f_prefix_table', 'phpwebgallery_' );
+    // prefixeTable
+    if ( !isset( $_POST['prefixeTable'] ) )
+      $vtp->setVar( $handle, 'step1.f_prefixeTable', 'phpwebgallery_' );
     else
-      $vtp->setVar( $handle, 'step1.f_prefix_table', $_POST['prefix_table'] );
+      $vtp->setVar( $handle, 'step1.f_prefixeTable', $_POST['prefixeTable'] );
 
     $vtp->closeSession( $handle, 'step1' );
@@ -189 +189 @@
       {
         $query = trim( $query );
-        $query = str_replace( 'phpwebgallery_', $prefix_table, $query );
+        $query = str_replace( 'phpwebgallery_', $prefixeTable, $query );
         // we don't execute "DROP TABLE" queries
         if ( !preg_match( '/^DROP TABLE/i', $query ) )
@@ -222 +222 @@
     if ( count( $errors ) == 0 )
     {
-      $query = 'DELETE FROM '.$prefix_table.'config';
-      mysql_query( $query );
-
-      $query = 'INSERT INTO '.$prefix_table.'config';
+      $query = 'DELETE FROM '.$prefixeTable.'config';
+      mysql_query( $query );
+
+      $query = 'INSERT INTO '.$prefixeTable.'config';
       $query.= ' (webmaster,mail_webmaster) VALUES ';
       $query.= " ('".$webmaster."','".$_POST['mail_webmaster']."')";
@@ -231 +231 @@
       mysql_query( $query );
 
-      $query = 'INSERT INTO '.$prefix_table.'sites';
+      $query = 'INSERT INTO '.$prefixeTable.'sites';
       $query.= " (id,galleries_url) VALUES (1, './galleries/')";
       $query.= ';';
@@ -237 +237 @@
 
       // webmaster admin user
-      $query = 'INSERT INTO '.$prefix_table.'users';
+      $query = 'INSERT INTO '.$prefixeTable.'users';
       $query.= ' (id,username,password,status,language) VALUES ';
       $query.= "(1,'".$webmaster."','".md5( $_POST['pwdWebmaster'] )."'";
@@ -245 +245 @@
 
       // guest user
-      $query = 'INSERT INTO '.$prefix_table.'users';
+      $query = 'INSERT INTO '.$prefixeTable.'users';
       $query.= '(id,username,password,status,language) VALUES ';
       $query.= "(2,'guest','','guest','francais')";

trunk/template/default/admin/install.vtp

@@ -185 +185 @@
     <tr>
       <td>{#step1_prefix}</td>
-      <td align=center><input type="text" name="prefix_table" value="{#f_prefix_table}" /></td>
+      <td align=center><input type="text" name="prefixeTable" value="{#f_prefixeTable}" /></td>
       <td class="row2">{#step1_prefix_info}</td>
     </tr>