Changeset 2365 in ExiteCMS

Timestamp:

07/29/10 17:48:33 (5 weeks ago)

Author:

root

Message:

added support for Trac 0.12 Multirepos

Location:

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn

Files:

• admin.php (modified) (6 diffs)
• module_installer.php (modified) (6 diffs)
• templates/modules.tracsvn.admin.tpl (modified) (2 diffs)
• templates/modules.tracsvn.side_panel.tpl (modified) (2 diffs)
• tracsvn.side_panel.php (modified) (1 diff)

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/admin.php

@@ -36 +36 @@
     $database = stripinput($_POST['database']);
     $url = stripinput($_POST['url']);
+    $repo = stripinput($_POST['repo']);
     $trac_url = stripinput($_POST['trac_url']);
     $cmd = stripinput($_POST['cmd']);
@@ -44 +45 @@
     $view_diff = isNum($_POST['view_diff']) ? $_POST['view_diff'] : 102;
     $view_file = isNum($_POST['view_file']) ? $_POST['view_file'] : 102;
-    
+
     $variables['message'] = "";
 
@@ -51 +52 @@
         $variables['message'] = ($variables['message'] == "" ? "" : "<br />") . $locale['406'];
     } else {
+        // if a repo is defined, check if it exists
+        if (!empty($repo)) {
+            if(!dbtable_exists("repository", $database)) {
+                $variables['message'] = ($variables['message'] == "" ? "" : "<br />") . $locale['459'];
+            } else {
+                $result = dbquery("SELECT * FROM ".$database.".repository WHERE name = '".mysql_real_escape_string($repo)."'");
+                if (!dbrows($result)) {
+                    $variables['message'] = ($variables['message'] == "" ? "" : "<br />") . $locale['460'];
+                }
+            }
+        }
         // check if the cmd points to svn
         $_tmp = explode(" ", $cmd);
@@ -86 +98 @@
         $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$database."' WHERE cfg_name = 'tracsvn_database'");
         $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$url."' WHERE cfg_name = 'tracsvn_url'");
+        $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$repo."' WHERE cfg_name = 'tracsvn_repo'");
         $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$trac_url."' WHERE cfg_name = 'tracsvn_trac_url'");
         $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$cmd."' WHERE cfg_name = 'tracsvn_svncmd'");
@@ -121 +134 @@
     $database = $settings['tracsvn_database'];
     $url = $settings['tracsvn_url'];
+    $repo = $settings['tracsvn_repo'];
     $trac_url = $settings['tracsvn_trac_url'];
     $cmd = $settings['tracsvn_svncmd'];
@@ -190 +204 @@
 $variables['database'] = $database;
 $variables['url'] = $url;
+$variables['repo'] = $repo;
 $variables['trac_url'] = $trac_url;
 $variables['cmd'] = $cmd;

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/module_installer.php

@@ -24 +24 @@
 $mod_title = "Trac-SVN reports";
 $mod_description = "This ExiteCMS module provides a reporting of Trac Project management, and connects to SVN to retrieve details status information";
-$mod_version = "0.1.6";
+$mod_version = "0.1.7";
 $mod_developer = "WanWizard";
 $mod_email = "wanwizard@exitecms.org";
@@ -129 +129 @@
 $localestrings['en']['456'] = "Non-public repository paths:";
 $localestrings['en']['457'] = "Trac base URL:";
+$localestrings['en']['458'] = "Trac SVN repository name:";
+$localestrings['en']['459'] = "A repository name is given, but your Trac installation has no support for multirepos";
+$localestrings['en']['460'] = "The repository name entered can not be located in the Trac database";
 
 $localestrings['en']['500'] = "Changeset";
@@ -211 +214 @@
 $localestrings['nl']['456'] = "Niet publieke repository paden:";
 $localestrings['nl']['457'] = "Trac basis URL:";
+$localestrings['nl']['458'] = "Trac SVN repository naam:";
+$localestrings['nl']['459'] = "Een repository naam is ingevoerd, maar de Trac installatie heeft geen multirepos ondersteuning";
+$localestrings['nl']['460'] = "De repository naam die is ingevoerd kan niet gevonden worden in de Trac database";
 
 $localestrings['nl']['500'] = "Changeset";
@@ -243 +249 @@
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_database', '')");
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_url', '')");
+$mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_repo', '')");
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_trac_url', '')");
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_svncmd', '/usr/bin/svn')");
@@ -270 +277 @@
 $mod_uninstall_cmds[] = array('type' => 'db', 'value' => "DELETE FROM ##PREFIX##configuration WHERE cfg_name = 'tracsvn_database'");
 $mod_uninstall_cmds[] = array('type' => 'db', 'value' => "DELETE FROM ##PREFIX##configuration WHERE cfg_name = 'tracsvn_url'");
+$mod_uninstall_cmds[] = array('type' => 'db', 'value' => "DELETE FROM ##PREFIX##configuration WHERE cfg_name = 'tracsvn_repo'");
 $mod_uninstall_cmds[] = array('type' => 'db', 'value' => "DELETE FROM ##PREFIX##configuration WHERE cfg_name = 'tracsvn_trac_url'");
 $mod_uninstall_cmds[] = array('type' => 'db', 'value' => "DELETE FROM ##PREFIX##configuration WHERE cfg_name = 'tracsvn_svncmd'");
@@ -322 +330 @@
             case "0.1.5":
                 // no upgrades this version
+            case "0.1.6":
+                // add the new trac repo name (support for v0.12 multirepos)
+                $result = dbquery("INSERT INTO ".$db_prefix."configuration( cfg_name, cfg_value ) VALUES ('tracsvn_repo', '')");
             default:
                 // do this with every upgrade

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/templates/modules.tracsvn.admin.tpl

@@ -58 +58 @@
             <td width='50%' class='tbl'>
                 <input type='text' name='url' value='{$url}' maxlength='255' class='textbox' style='width:300px;' />
+            </td>
+        </tr>
+        <tr>
+            <td width='50%' class='tbl'>
+                {$locale.458}
+            </td>
+            <td width='50%' class='tbl'>
+                <input type='text' name='repo' value='{$repo}' maxlength='50' class='textbox' style='width:250px;' />
             </td>
         </tr>
@@ -126 +134 @@
         </tr>
     </table>
-</form> 
+</form>
 {include file="_closetable.tpl"}
 {include file="_opentable.tpl" name=$_name title=$locale.407 state=$_state style=$_style}

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/templates/modules.tracsvn.side_panel.tpl

@@ -20 +20 @@
 {include file="_openside_x.tpl" name=$_name title=$locale.401 state=$_state style=$_style}
     {if $rev != 0}
-        <div style="text-align:center;cursor:pointer;" onclick="window.open('{$settings.tracsvn_trac_url}changeset/{$rev}')" title="{$locale.110} {$locale.402} {$rev}">
+        <div style="text-align:center;cursor:pointer;" onclick="window.open('{$settings.tracsvn_trac_url}changeset/{$rev}{$repo}')" title="{$locale.110} {$locale.402} {$rev}">
             <span class='small'>{$locale.402}</span>
             <b>{$rev}</b>
@@ -28 +28 @@
             <b>{$date|date_format:"%d %b %Y · %H:%M"}</b>
             <br />
-            <span class='small'>{$locale.404}</span> 
+            <span class='small'>{$locale.404}</span>
             <b>{$dev.user_name}</b>
         </div>

modules/ExiteCMS/tracsvn/php-files/modules/tracsvn/tracsvn.side_panel.php

@@ -30 +30 @@
         $data = dbarray($result);
         $variables['rev'] = (int) $data['rev'];
+        if (empty($settings['tracsvn_repo'])) {
+            $variables['repo'] = "";
+        } else {
+            $variables['repo'] = '/' . $settings['tracsvn_repo'];
+        }
         if (strlen($data['time']) > 10) $data['time'] = substr($data['time'],0,10);
         $variables['date'] = $data['time'];