Dev Changing controller URLs to allow for IIS compatibility

LimeSurvey · Nov 30, 2012 · 69b1115 · 69b1115
1 parent b7b65f5
commit 69b1115
Show file tree

Hide file tree

Showing 20 changed files with 64 additions and 64 deletions.
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
@@ -450,7 +450,7 @@ function storeUserControlValues()
             $stg ->stg_value=Yii::app()->request->getPost('userideditable');
             $stg->save();
         }
-        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/userControl'));
+        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/sa/userControl'));
     }
 
     /**
@@ -473,7 +473,7 @@ function storeBlacklistValues()
                 $stg->save();
             }
         }
-        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/blacklistControl'));
+        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/sa/blacklistControl'));
     }
 
     /**
@@ -1242,7 +1242,7 @@ function saveAttribute()
             );
             ParticipantAttributeNames::model()->saveAttributeValue($editattvalue);
         }
-        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/attributeControl'));
+        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/sa/attributeControl'));
     }
 
     /*
@@ -1253,7 +1253,7 @@ function delAttributeValues()
         $iAttributeId = Yii::app()->request->getQuery('aid');
         $iValueId = Yii::app()->request->getQuery('vid');
         ParticipantAttributeNames::model()->delAttributeValues($iAttributeId, $iValueId);
-        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('/admin/participants/viewAttribute/aid/' . $iAttributeId));
+        Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('/admin/participants/sa/viewAttribute/aid/' . $iAttributeId));
     }
 
     /*

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -475,7 +475,7 @@ function getTokens_json($iSurveyId, $search = null)
             }
             $action .= viewHelper::getImageLink('edit_16.png', null, $clang->gT("Edit token entry"), null, 'imagelink token_edit');
             if (!empty($token['participant_id']) && $token['participant_id'] != "") {
-                $action .= viewHelper::getImageLink('cpdb_16.png', "admin/participants/displayParticipants/searchurl/participant_id||equal||" . $token['participant_id'], $clang->gT("View this person in the central participants database"), '_top');
+                $action .= viewHelper::getImageLink('cpdb_16.png', "admin/participants/sa/displayParticipants/searchurl/participant_id||equal||" . $token['participant_id'], $clang->gT("View this person in the central participants database"), '_top');
             } else {
                 $action .= '<div style="width: 20px; height: 16px; float: left;"></div>';
             }

diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php
@@ -7,12 +7,12 @@
     }
 ?>
 <script type='text/javascript'>
-    var graphUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/graph"); ?>";
+    var graphUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/sa/graph"); ?>";
     var sStatisticsLanguage="<?php echo $sStatisticsLanguage; ?>";
-    var listColumnUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/listcolumn/surveyid/".$surveyid."/column/"); ?>";
+    var listColumnUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/sa/listcolumn/surveyid/".$surveyid."/column/"); ?>";
     var showTextInline="<?php echo $showtextinline ?>";
 </script>
-<form method='post' name='formbuilder' action='<?php echo Yii::app()->getController()->createUrl("admin/statistics/index/surveyid/$surveyid"); ?>#start'>
+<form method='post' name='formbuilder' action='<?php echo Yii::app()->getController()->createUrl("admin/statistics/sa/index/surveyid/$surveyid"); ?>#start'>
     <div class='header ui-widget-header header_statistics'>
         <div style='float:right;'><img src='<?php echo $sImageURL; ?>/maximize.png' id='showgfilter' alt='<?php $clang->eT("Maximize"); ?>'/><img src='<?php echo $sImageURL; ?>/minimize.png' id='hidegfilter' alt='<?php $clang->eT("Minimize"); ?>'/></div>
         <?php $clang->eT("General filters"); ?>
@@ -140,7 +140,7 @@
         </div>
         <p>
             <input type='submit' value='<?php $clang->eT("View statistics"); ?>' />
-            <input type='button' value='<?php $clang->eT("Clear"); ?>' onclick="window.open('<?php echo Yii::app()->getController()->createUrl("admin/statistics/surveyid/$surveyid"); ?>', '_top')" />
+            <input type='button' value='<?php $clang->eT("Clear"); ?>' onclick="window.open('<?php echo Yii::app()->getController()->createUrl("admin/statistics/sa/surveyid/$surveyid"); ?>', '_top')" />
         </p>
     </div>
     <div style='clear: both'></div>
@@ -1270,7 +1270,7 @@
 
     <p id='vertical_slide2'>
     <input type='submit' value='<?php $clang->eT("View statistics"); ?>' />
-    <input type='button' value='<?php $clang->eT("Clear"); ?>' onclick="window.open('<?php echo Yii::app()->getController()->createUrl("admin/statistics/index/surveyid/$surveyid"); ?>', '_top')" />
+    <input type='button' value='<?php $clang->eT("Clear"); ?>' onclick="window.open('<?php echo Yii::app()->getController()->createUrl("admin/statistics/sa/index/surveyid/$surveyid"); ?>', '_top')" />
     <input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />
     <input type='hidden' name='display' value='stats' />
     </p>

diff --git a/application/views/admin/participants/attributeControl_view.php b/application/views/admin/participants/attributeControl_view.php
@@ -19,12 +19,12 @@
     var sSearchTitle= "<?php $clang->eT("Search...", 'js') ?>";
     var sOptionAnd= "<?php $clang->eT("AND", 'js') ?>";
     var sOptionOr= "<?php $clang->eT("OR", 'js') ?>";
-    var attributeInfoUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/getAttributeInfo_json"); ?>";
-    var editAttributeUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/editAttributeInfo"); ?>";
+    var attributeInfoUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/getAttributeInfo_json"); ?>";
+    var editAttributeUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/editAttributeInfo"); ?>";
     var attributeControlCols = '["<?php $clang->eT('Actions'); ?>", "<?php $clang->eT('Attribute name'); ?>", "<?php $clang->eT('Attribute type'); ?>", "<?php $clang->eT('Visible in participants panel'); ?>"]';
     var attributeTypeSelections = "TB:<?php $clang->eT("Text box"); ?>;DD:<?php $clang->eT("Drop-down list"); ?>;DP:<?php $clang->eT("Date"); ?>";
     var attributeTypeSearch = "<?php $clang->eT("Text box"); ?>:<?php $clang->eT("Text box"); ?>; <?php $clang->eT("Date"); ?>:<?php $clang->eT("Date"); ?>; <?php $clang->eT("Drop-down list"); ?>:<?php $clang->eT("Drop-down list"); ?>"
-    var attributeEditUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/viewAttribute/aid"); ?>";
+    var attributeEditUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/viewAttribute/aid"); ?>";
     var sOperator1= '<?php $clang->eT("equal",'js');?>';
     var sOperator2= '<?php $clang->eT("not equal",'js');?>';
     var sOperator3= '<?php $clang->eT("less",'js');?>';

diff --git a/application/views/admin/participants/attributeMapCSV_view.php b/application/views/admin/participants/attributeMapCSV_view.php
@@ -11,9 +11,9 @@
         <script src="<?php echo Yii::app()->getConfig('adminscripts') . "attributeMapCSV.js" ?>" type="text/javascript"></script>
         <script type="text/javascript">
 
-            var copyUrl = "<?php echo $this->createURL("admin/participants/uploadCSV"); ?>";
-            var displayParticipants = "<?php echo $this->createURL("admin/participants/displayParticipants"); ?>";
-            var mapCSVcancelled = "<?php echo $this->createURL("admin/participants/mapCSVcancelled"); ?>";
+            var copyUrl = "<?php echo $this->createUrl("admin/participants/sa/uploadCSV"); ?>";
+            var displayParticipants = "<?php echo $this->createUrl("admin/participants/sa/displayParticipants"); ?>";
+            var mapCSVcancelled = "<?php echo $this->createUrl("admin/participants/sa/mapCSVcancelled"); ?>";
             var characterset = "<?php echo $_POST['characterset']; ?>";
             var okBtn = "<?php $clang->eT("OK") ?>";
             var processed = "<?php $clang->eT("Summary") ?>";

diff --git a/application/views/admin/participants/attributeMap_view.php b/application/views/admin/participants/attributeMap_view.php
@@ -1,12 +1,12 @@
 <script type="text/javascript">
-    var redUrl = "<?php echo $this->createUrl("/admin/participants/displayParticipants"); ?>";
+    var redUrl = "<?php echo $this->createUrl("/admin/participants/sa/displayParticipants"); ?>";
     var surveyId = "<?php echo $survey_id ?>";
     var redirect = "<?php echo $redirect ?>";
     if(redirect=='TRUE')
     {
         redUrl = "<?php echo $this->createUrl("/admin/tokens/sa/browse/surveyid/{$survey_id}"); ?>";
     }
-    var copyUrl = "<?php echo $this->createUrl("/admin/participants/addToTokenattmap"); ?>";
+    var copyUrl = "<?php echo $this->createUrl("/admin/participants/sa/addToTokenattmap"); ?>";
 
     var participant_id = "<?php echo $participant_id; ?>";
 

diff --git a/application/views/admin/participants/blacklist_view.php b/application/views/admin/participants/blacklist_view.php
@@ -19,7 +19,7 @@
         if (Yii::app()->session['USER_RIGHT_SUPERADMIN'])
         {
             $attribute = array('class' => 'form44');
-            echo CHtml::beginForm($this->createUrl('/admin/participants/storeBlacklistValues'), 'post', $attribute);
+            echo CHtml::beginForm($this->createUrl('/admin/participants/sa/storeBlacklistValues'), 'post', $attribute);
             $options = array('1' => $clang->gT('Yes'), '0' => $clang->gT('No'));
             ?>
             <ul>

diff --git a/application/views/admin/participants/displayParticipants_view.php b/application/views/admin/participants/displayParticipants_view.php
@@ -94,7 +94,7 @@
     var dateAddedColTxt="<?php $clang->eT("Date added", 'js') ?>";
     var dateInvitedColTxt="<?php $clang->eT("Last invited", 'js') ?>";
     var dateCompletedColTxt="<?php $clang->eT("Submitted", 'js') ?>";
-    var surveylinkUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/getSurveyInfo_json/pid/"); ?>";
+    var surveylinkUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/getSurveyInfo_json/pid/"); ?>";
 
     /* Colnames and heading for attributes subgrid */
     var attributesHeadingTxt="<?php $clang->eT("Participant's attribute information", 'js') ?>";
@@ -144,29 +144,29 @@
     var deleteMsg = "<br/>"+deletefrompanelmsg+"<br/><br/><ol id='selectable' class='selectable' ><li class='ui-widget-content' id='po'>"+deletefrompanel+"</li><li class='ui-widget-content' id='ptt'>"+deletefrompanelandtoken+"</li><li class='ui-widget-content' id='ptta'>"+deletefrompaneltokenandresponse+"</li></ol>";
     var searchBtn = "<?php $clang->eT("Search", 'js') ?>";
     var shareMsg = "<?php $clang->eT("You can see and edit settings for shared participants in share panel.", 'js') ?>"; //PLEASE REVIEW
-    var jsonUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/".$urlsearch); ?>";
-    var jsonSearchUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/getParticipantsResults_json/search/"); ?>";
-    var editUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/editParticipant"); ?>";
+    var jsonUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/".$urlsearch); ?>";
+    var jsonSearchUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/getParticipantsResults_json/search/"); ?>";
+    var editUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/editParticipant"); ?>";
     var autowidth = "<?php echo $autowidth ?>";
-    var getSearchIDs = "<?php echo Yii::app()->getController()->createUrl("admin/participants/getSearchIDs"); ?>";
-    var getaddtosurveymsg = "<?php echo Yii::app()->getController()->createUrl("admin/participants/getaddtosurveymsg"); ?>";
+    var getSearchIDs = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/getSearchIDs"); ?>";
+    var getaddtosurveymsg = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/getaddtosurveymsg"); ?>";
     var minusbutton = "<?php echo Yii::app()->getConfig('adminimageurl') . "deleteanswer.png" ?>";
     var imageurl = "<?php echo Yii::app()->getConfig('adminimageurl') ?>";
     var addbutton = "<?php echo Yii::app()->getConfig('adminimageurl') . "plus.png" ?>";
     var minusbuttonTxt = "<?php $clang->eT("Remove search condition", 'js') ?>";
     var addbuttonTxt = "<?php $clang->eT("Add search condition", 'js') ?>";
-    var delparticipantUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/delParticipant"); ?>";
-    var getAttribute_json = "<?php echo Yii::app()->getController()->createUrl("admin/participants/getAttribute_json/pid/"); ?>";
-    var exporttocsv = "<?php echo Yii::app()->getController()->createUrl("admin/participants/exporttocsv/id"); ?>";
-    var exporttocsvcount = "<?php echo Yii::app()->getController()->createUrl("admin/participants/exporttocsvcount"); ?>";
-    var getcpdbAttributes_json = "<?php echo Yii::app()->getController()->createUrl("admin/participants/exporttocsvcount"); ?>";
-    var attMapUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/attributeMap"); ?>";
-    var editAttributevalue = "<?php echo Yii::app()->getController()->createUrl("admin/participants/editAttributevalue"); ?>";
-    var shareUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/shareParticipants"); ?>";
-    var surveyUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/addToToken"); ?>";
-    var postUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/setSession"); ?>";
+    var delparticipantUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/delParticipant"); ?>";
+    var getAttribute_json = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/getAttribute_json/pid/"); ?>";
+    var exporttocsv = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/exporttocsv/id"); ?>";
+    var exporttocsvcount = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/exporttocsvcount"); ?>";
+    var getcpdbAttributes_json = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/exporttocsvcount"); ?>";
+    var attMapUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/attributeMap"); ?>";
+    var editAttributevalue = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/editAttributevalue"); ?>";
+    var shareUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/shareParticipants"); ?>";
+    var surveyUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/addToToken"); ?>";
+    var postUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/setSession"); ?>";
     var ajaxUrl = "<?php echo Yii::app()->getConfig('adminimageurl') . "/ajax-loader.gif" ?>";
-    var redUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/displayParticipants"); ?>";
+    var redUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/displayParticipants"); ?>";
     var colNames = '["participant_id","can_edit","<?php $clang->eT("First name") ?>","<?php $clang->eT("Last name") ?>","<?php $clang->eT("Email") ?>","<?php $clang->eT("Blacklisted") ?>","<?php $clang->eT("Surveys") ?>","<?php $clang->eT("Language") ?>","<?php $clang->eT("Owner name") ?>"<?php echo $columnNames; ?>]';
     var colModels = '[{ "name":"participant_id", "index":"participant_id", "width":100, "align":"center", "sorttype":"int", "sortable": true, "editable":false, "hidden":true},';
     colModels += '{ "name":"can_edit", "index":"can_edit", "width":10, "align":"center", "sorttype":"int", "sortable": true, "editable":false, "hidden":true},';
@@ -283,7 +283,7 @@
 
 <!-- Add To Survey Popup Window -->
 <div class="ui-widget ui-helper-hidden" id="client-script-return-msg" style="display:none">
-    <form action="<?php echo Yii::app()->getController()->createUrl("admin/participants/attributeMap"); ?>" name="addsurvey" id="addsurvey" method="POST">
+    <form action="<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/attributeMap"); ?>" name="addsurvey" id="addsurvey" method="POST">
         <input type="hidden" name="participant_id" id="participant_id" value=""></input>
         <input type="hidden" name="count" id="count" value=""></input>
         <div class='popupgroup'>

diff --git a/application/views/admin/participants/importCSV_view.php b/application/views/admin/participants/importCSV_view.php
@@ -1,7 +1,7 @@
 <div class='header ui-widget-header'>
     <strong><?php $clang->eT("Import CSV"); ?> </strong>
 </div>
-<form action="<?php echo $this->createURL('admin/participants/attributeMapCSV'); ?>" method="post" accept-charset="utf-8" class="form44" enctype="multipart/form-data">
+<form action="<?php echo $this->createUrl('admin/participants/sa/attributeMapCSV'); ?>" method="post" accept-charset="utf-8" class="form44" enctype="multipart/form-data">
     <ul>
         <li>
             <label for="the_file" id="fileupload">

diff --git a/application/views/admin/participants/participantsPanel_view.php b/application/views/admin/participants/participantsPanel_view.php
@@ -80,21 +80,21 @@
         <div class='menubar-left'>
             <?php
             echo CHtml::link(CHtml::image($home['src'], $home['alt']), Yii::app()->getController()->createUrl("/admin"));
-            echo CHtml::link(CHtml::image($information['src'], $information['alt']), $this->createURL('admin/participants/index'));
-            echo CHtml::link(CHtml::image($display['src'], $display['alt']), $this->createURL('admin/participants/displayParticipants'));
+            echo CHtml::link(CHtml::image($information['src'], $information['alt']), $this->createUrl('admin/participants/sa/index'));
+            echo CHtml::link(CHtml::image($display['src'], $display['alt']), $this->createUrl('admin/participants/sa/displayParticipants'));
             echo CHtml::image($seperator['src'], $seperator['alt'], $seperator['options']);
-            echo CHtml::link(CHtml::image($import['src'], $import['alt']), $this->createURL('admin/participants/importCSV'));
-            echo CHtml::link(CHtml::image($export['src'], $export['alt']), $this->createURL('admin/participants/exporttocsvAll'));
+            echo CHtml::link(CHtml::image($import['src'], $import['alt']), $this->createUrl('admin/participants/sa/importCSV'));
+            echo CHtml::link(CHtml::image($export['src'], $export['alt']), $this->createUrl('admin/participants/sa/exporttocsvAll'));
             echo CHtml::image($seperator['src'], $seperator['alt'], $seperator['options']);
-            echo CHtml::link(CHtml::image($blacklist['src'], $blacklist['alt']), $this->createURL('admin/participants/blacklistControl'));
+            echo CHtml::link(CHtml::image($blacklist['src'], $blacklist['alt']), $this->createUrl('admin/participants/sa/blacklistControl'));
             if (Yii::app()->session['USER_RIGHT_SUPERADMIN'])
             {
-                echo CHtml::link(CHtml::image($globalsettings['src'], $globalsettings['alt']), $this->createURL('admin/participants/userControl'));
+                echo CHtml::link(CHtml::image($globalsettings['src'], $globalsettings['alt']), $this->createUrl('admin/participants/sa/userControl'));
             }
             echo CHtml::image($seperator['src'], $seperator['alt'], $seperator['options']);
-            echo CHtml::link(CHtml::image($attributecontrol['src'], $attributecontrol['alt']), $this->createURL('admin/participants/attributeControl'));
+            echo CHtml::link(CHtml::image($attributecontrol['src'], $attributecontrol['alt']), $this->createUrl('admin/participants/sa/attributeControl'));
             echo CHtml::image($seperator['src'], $seperator['alt'], $seperator['options']);
-            echo CHtml::link(CHtml::image($sharepanel['src'], $sharepanel['alt']), $this->createURL('admin/participants/sharePanel'));
+            echo CHtml::link(CHtml::image($sharepanel['src'], $sharepanel['alt']), $this->createUrl('admin/participants/sa/sharePanel'));
             ?>
         </div>
     </div>