Changeset 882 for plugins/plugin_directory/trunk/plugin_directory.plugin.php

Timestamp:

09/03/08 03:13:42 (4 months ago)

Author:

MattRead

Message:

plugin:plugin_directory random updates

Files:

• plugins/plugin_directory/trunk/plugin_directory.plugin.php (modified) (6 diffs)

plugins/plugin_directory/trunk/plugin_directory.plugin.php

@@ -74 +74 @@
 
         // put together our rule
-        $rule['name'] = 'repo_browser';
+        $rule['name'] = 'display_plugin';
         $rule['parse_regex'] = '%^packages/browse(?:page/(?P<page>[2-9]|[1-9][0-9]+))?/?$%';
         $rule['build_str'] = 'packages/browse';
@@ -174 +174 @@
 
             $form->plugin_versions->append('static', 'new_version', 'Add New Version');
-            $version = $plugin_versions->append('text', 'plugin_version_number', 'null:null', _t( 'Version Number' ));
+            $version = $plugin_versions->append('text', 'plugin_version_version', 'null:null', _t( 'Version Number' ));
             $version->template = 'tabcontrol_text';
             $description = $plugin_versions->append('text', 'plugin_version_description', 'null:null', _t( 'Version Description' ));
@@ -183 +183 @@
             $habari_version->template = 'tabcontrol_text';
 
-            //$plugin_versions->append( 'radio', 'status', 'null:null', _t( 'Critical' ) );
-            //$plugin_versions->append( 'radio', 'status', 'null:null', _t( 'Bugfix' ) );
-            //$plugin_versions->append( 'radio', 'status', 'null:null', _t( 'Feature' ) );
+            $status = $plugin_versions->append( 'radio', 'plugin_version_status', 'null:null');
+            $status->options = array(
+                'critical' => 'Critical',
+                'bugfix' => 'Bugfix',
+                'feature' => 'Feature',
+                );
 
             //$requires = $plugin_versions->append('text', 'plugin_version[requires]', 'null:null', _t( 'Requires' ));
@@ -204 +207 @@
                 }
             }
-
-            // Check if new version information has been uploaded
-            if ( $form->{"plugin_version_number"}->value ) {
-                foreach ( $this->version_fields as $version_field ) {
-                    // todo Do something sensible with the new version information
-                    //if ( $form->{"plugin_version_$version_field"}->value ) {
-                    //  $post->info->{$version_field} = $form->{"plugin_details_$version_field"}->value;
-                    //}
-                }
-                Session::notice( 'Added version number ' . $form->{"plugin_version_number"}->value );
-            }
-
-            //$this->save_versions( $post, $form );
+            
+            $this->save_versions( $post, $form );
         }
     }
@@ -223 +215 @@
         * @todo check for required inputs
         */
-    public function save_versions( $post )
-    {
-        $plugin_version = Controller::get_var( 'plugin_version' );
-        if ( !empty( $plugin_version['version'] ) ) {
-            $plugin_version['post_id'] = $post->id;
-            $plugin_version['md5'] = $this->get_version_md5( $plugin_version['url'] );
+    public function save_versions( $post, $form )
+    {
+        if ( $form->plugin_version_version->value ) {
             $version_vals = array();
             foreach ( $this->version_fields as $version_field ) {
-                $version_vals[$version_field] = $plugin_version[$version_field];
-            }
-            Session::notice( 'we made it!' );
-
+                if ( $form->{"plugin_version_$version_field"} ) {
+                    $version_vals[$version_field] = $form->{"plugin_version_$version_field"}->value;
+                    Utils::debug($form->{"plugin_version_$version_field"}->value);
+                }
+                else {
+                    $version_vals[$version_field] = '';
+                }
+                Utils::debug($version_field );
+            }
+            $version_vals['post_id'] = $post->id;
+            $version_vals['md5'] = $this->get_version_md5( $version_vals['url'] );
+            
             DB::update(
                 DB::table( 'plugin_versions' ),
@@ -240 +237 @@
                 array( 'version' => $version_vals['version'], 'post_id' => $post->id )
             );
+            
+            Session::notice( 'Added version number ' . $version_vals['version'] );
         }
     }