Fixed merger changes for cpdb

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10696 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 11, 2011 · 9f61e27 · 9f61e27
1 parent 73e95d7
commit 9f61e27
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 91 deletions.
diff --git a/application/controllers/admin/participants.php b/application/controllers/admin/participants.php
@@ -853,7 +853,7 @@ function attributeMapCSV()
     {
         $data = array('upload_data' => $this->upload->data());
         $filename = $this->upload->data('full_path');
-        $the_full_file_path = site_url('/tmp/uploads/'.$filename['file_name']);
+        $the_full_file_path = base_url().'tmp/uploads/'.$filename['file_name'];
         $regularfields = array('firstname','participant_id','lastname','email','language','blacklisted','owner_uid');
         $csvread = fopen($the_full_file_path,'r');
 
@@ -1135,10 +1135,12 @@ function uploadCSV()
              }
            $recordcount++;
         }
+
        unlink('tmp/uploads/'.basename($the_full_file_path));
 
        self::_getAdminHeader();
        $clang = $this->limesurvey_lang;
+
        $data = array('clang'=> $clang,
                 'duplicatelist' => $duplicatelist,
                 'recordcount' => $recordcount-1,
@@ -1151,16 +1153,7 @@ function uploadCSV()
                 'invalidattribute' => $invalidattribute,
                 'invalidparticipantid' => $invalidparticipantid
            );
-       $this->session->set_flashdata('duplicatelist', $duplicatelist);
-       $this->session->set_flashdata('recordcount', $recordcount-1);
-       $this->session->set_flashdata('mincriteria', $mincriteria);
-       $this->session->set_flashdata('imported', $imported);
-       $this->session->set_flashdata('dupcount', count($duplicatelist));
-       $this->session->set_flashdata('errorinupload', $errorinupload);
-       $this->session->set_flashdata('invalidmaillist', $invalidemaillist);
-       $this->session->set_flashdata('mandatory', $mandatory);
-       $this->session->set_flashdata('invalidattribute', $invalidattribute);
-       $this->session->set_flashdata('invalidattribute',$invalidparticipantid);
+          redirect('admin/participants/summaryview');
 }
 function summaryview()
 {

diff --git a/application/views/admin/Participants/attributeControl_view.php b/application/views/admin/Participants/attributeControl_view.php
@@ -1,9 +1,9 @@
 <html>
     <head>
-        <script src="<?php echo site_url("scripts/jquery/jquery.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery-ui.js")?>" type="text/javascript"></script>
-         <script src="<?php echo site_url("scripts/admin/attributeControl.js")?>" type="text/javascript"></script>
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/participants.css")?>" />
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery-ui.js" ?>" type="text/javascript"></script>
+         <script src="<?php echo $this->config->item('adminscripts')."attributeControl.js" ?>" type="text/javascript"></script>
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/participants.css" ?>" />
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     </head>
     <body>
@@ -85,7 +85,7 @@
         </div>
         </table></li>
         <br>
-        <li><a href="#" class="add"><img src = "<?php echo site_url('images/plus.png')?>" alt="Add Attribute" width="25" height="25" title="Add Attribute" id="add" name="add"></a></li></ul>
+        <li><a href="#" class="add"><img src = "<?php echo base_url().'images/plus.png' ?>" alt="Add Attribute" width="25" height="25" title="Add Attribute" id="add" name="add"></a></li></ul>
 
         <br>
         <p><input type="submit" name="Save" value="Save"></p>

diff --git a/application/views/admin/Participants/attributeMapCSV_view.php b/application/views/admin/Participants/attributeMapCSV_view.php
@@ -2,13 +2,13 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/attributeMapCSV.css")?>" />
-        <script src="<?php echo site_url("scripts/jquery/jquery.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery-ui.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery.qtip.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery.ui.sortable.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/admin/attributeMapCSV.js")?>" type="text/javascript"></script>
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/attributeMapCSV.css" ?>" />
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery-ui.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.qtip.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.ui.sortable.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('adminscripts')."attributeMapCSV.js" ?>" type="text/javascript"></script>
         <script type="text/javascript">
             var redUrl = "<?php echo site_url("admin/participants/summaryview");?>";
             var copyUrl = "<?php echo site_url("admin/participants/uploadCSV");?>";

diff --git a/application/views/admin/Participants/attributeMapToken_view.php b/application/views/admin/Participants/attributeMapToken_view.php
@@ -1,11 +1,11 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/attributeMapToken.css")?>" />
-        <script src="<?php echo site_url("scripts/jquery/jquery.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery-ui.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery.ui.sortable.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/admin/attributeMapToken.js")?>" type="text/javascript"></script>
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/attributeMapToken.css" ?>" />
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery-ui.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.ui.sortable.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('adminscripts')."attributeMapToken.js" ?>" type="text/javascript"></script>
         <script type="text/javascript">
             var redUrl = "<?php echo site_url("admin/participants/displayParticipants");?>";
             var copyUrl = "<?php echo site_url("admin/participants/addToCentral");?>";

diff --git a/application/views/admin/Participants/attributeMap_view.php b/application/views/admin/Participants/attributeMap_view.php
@@ -2,13 +2,13 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/attributeMap.css")?>" />
-        <script src="<?php echo site_url("scripts/jquery/jquery.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery-ui.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery.qtip.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery.ui.sortable.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/admin/attributeMap.js")?>" type="text/javascript"></script>
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/attributeMap.css" ?>" />
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery-ui.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.qtip.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.ui.sortable.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('adminscripts')."attributeMap.js" ?>" type="text/javascript"></script>
         <script type="text/javascript">
             var redUrl = "<?php echo site_url("admin/participants/displayParticipants");?>";
             var surveyId = "<?php echo $this->uri->segment(4); ?>";

diff --git a/application/views/admin/Participants/displayParticipants_view.php b/application/views/admin/Participants/displayParticipants_view.php
@@ -1,21 +1,21 @@
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo site_url("scripts/jquery/css/start/jquery-ui.css")?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo site_url("scripts/jquery/css/jquery.multiselect.css")?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo site_url("scripts/jquery/css/jquery.multiselect.filter.css")?>" />
-<link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/displayParticipants.css")?>" />
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo site_url("scripts/jquery/jqGrid/css/ui.jqgrid.css")?>" />
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo site_url("scripts/jquery/jqGrid/css/jquery.ui.datepicker.css")?>" />
-<script src="<?php echo site_url("scripts/jquery/jquery.js")?>" type="text/javascript"></script>
-<script src="<?php echo site_url("scripts/jquery/jqGrid/js/i18n/grid.locale-en.js")?>" type="text/javascript"></script>
-<script src="<?php echo site_url("scripts/jquery/jqGrid/js/jquery.jqGrid.min.js")?>" type="text/javascript"></script>
-<script src="<?php echo site_url("scripts/jquery/jqGrid/js/jquery.ui.datepicker.js")?>" type="text/javascript"></script>
-<script src="<?php echo site_url("scripts/jquery/jqGrid/js/jquery.ui.core.js")?>" type="text/javascript"></script>
-<script src="<?php echo site_url("scripts/jquery/jquery-ui.js")?>" type="text/javascript"></script>
-<script src="<?php echo site_url("scripts/jquery/jquery.multiselect.min.js")?>" type="text/javascript"></script>
-<script src="<?php echo site_url("scripts/jquery/jquery.multiselect.filter.min.js")?>" type="text/javascript"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('generalscripts')."jquery/css/start/jquery-ui.css" ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('generalscripts')."jquery/css/jquery.multiselect.css" ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('generalscripts')."jquery/css/jquery.multiselect.filter.css" ?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/displayParticipants.css" ?>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/css/ui.jqgrid.css" ?>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/css/jquery.ui.datepicker.css" ?>" />
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.js"?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/i18n/grid.locale-en.js" ?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/jquery.jqGrid.min.js" ?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/jquery.ui.datepicker.js" ?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/jquery.ui.core.js" ?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jquery-ui.js" ?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.multiselect.min.js" ?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.multiselect.filter.min.js" ?>" type="text/javascript"></script>
 <?php
 /* If there are any attributes to display as extra columns in the jqGrid, iterate through them */
 
@@ -90,7 +90,7 @@
 var jsonSearchUrl = "<?php echo site_url("admin/participants/getParticipantsResults_json");?>";
 var editUrl = "<?php echo site_url("admin/participants/editParticipant"); ?>";
 var minusbutton = "<?php echo site_url("/images/deleteanswer.png"); ?>";
-var addbutton = "<?php echo site_url("/images/plus.png"); ?>";
+var addbutton = "<?php echo base_url()."images/plus.png" ?>";
 var surveylinkUrl = "<?php echo site_url("admin/participants/getSurveyInfo_json"); ?>";
 var getAttribute_json = "<?php echo site_url("admin/participants/getAttribute_json");?>";
 var exporttocsv = "<?php echo site_url("admin/participants/exporttocsv");?>";
@@ -117,11 +117,12 @@
     echo $colModels;
 ?>
 </script>
-<script src="<?php echo site_url("scripts/admin/displayParticipant.js")?>" type="text/javascript"></script>
+<script src="<?php echo $this->config->item('generalscripts')."admin/displayParticipant.js" ?>" type="text/javascript"></script>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title></title>
 </head>
 <body>
+
 <div id ="search" style="display:none">
 <?php 
 $optionsearch = array( '' => 'Select One',
@@ -157,7 +158,7 @@
 <td><?php echo form_dropdown('field_1',$optionsearch,'','id="field_1"'); ?></td>
 <td><?php echo form_dropdown('condition_1',$optioncontition,'','id="condition_1"'); ?></td>
 <td><input type="text" id="conditiontext_1" style="margin-left:10px;" /></td>
-<td><img src=<?php echo site_url("/images/plus.png"); ?>  id="addbutton" style="margin-bottom:4px"></td>
+<td><img src=<?php echo base_url()."images/plus.png" ?>  id="addbutton" style="margin-bottom:4px"></td>
 </tr>
 </table>
 <br>

diff --git a/application/views/admin/Participants/importCSV_view.php b/application/views/admin/Participants/importCSV_view.php
@@ -2,7 +2,7 @@
         <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <title></title>
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" />
         </head>
         <body>
         <div class='header ui-widget-header'>

diff --git a/application/views/admin/Participants/participantsPanel_view.php b/application/views/admin/Participants/participantsPanel_view.php
@@ -2,7 +2,7 @@
 <html>
     <head>
 
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" />
+       <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" />
         <title></title>
     </head>
     <body>

diff --git a/application/views/admin/Participants/sharePanel_view.php b/application/views/admin/Participants/sharePanel_view.php
@@ -1,19 +1,19 @@
 
 <html>
     <head>
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo site_url("scripts/jquery/css/start/jquery-ui.css")?>" />
-        <link rel="stylesheet" type="text/css" media="screen" href="<?php echo site_url("scripts/jquery/jqGrid/css/ui.jqgrid.css")?>" />
-        <link rel="stylesheet" type="text/css" media="screen" href="<?php echo site_url("scripts/jquery/jqGrid/css/jquery.ui.datepicker.css")?>" />
-        <script src="<?php echo site_url("scripts/jquery/jquery.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jqGrid/js/i18n/grid.locale-en.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jqGrid/js/jquery.jqGrid.min.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jqGrid/js/jquery.ui.datepicker.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jqGrid/js/jquery.ui.core.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jqGrid/plugins/jquery.searchFilter.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jqGrid/src/grid.celledit.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/jquery/jquery-ui.js")?>" type="text/javascript"></script>
-        <script src="<?php echo site_url("scripts/admin/sharePanel.js")?>" type="text/javascript"></script>
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('generalscripts')."jquery/css/start/jquery-ui.css" ?>" />
+        <link rel="stylesheet" type="text/css" media="screen" href="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/css/ui.jqgrid.css" ?>" />
+        <link rel="stylesheet" type="text/css" media="screen" href="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/css/jquery.ui.datepicker.css" ?>" />
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/i18n/grid.locale-en.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/jquery.jqGrid.min.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/jquery.ui.datepicker.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/js/jquery.ui.core.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/plugins/jquery.searchFilter.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jqGrid/src/grid.celledit.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('generalscripts')."jquery/jquery-ui.js" ?>" type="text/javascript"></script>
+        <script src="<?php echo $this->config->item('adminscripts')."sharePanel.js" ?>" type="text/javascript"></script>
         <script type="text/javascript">
             var shareinfoUrl = "<?php echo site_url("admin/participants/getShareInfo_json");?>";
             var editurlshare = "<?php echo site_url("admin/participants/editShareInfo"); ?>";

diff --git a/application/views/admin/Participants/summary_view.php b/application/views/admin/Participants/summary_view.php
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <html>
-    <head><link rel="stylesheet" type="text/css" href="<?php echo site_url("styles/admin/default/adminstyle.css")?>" /></head>
+    <head><link rel="stylesheet" type="text/css" href="<?php echo $this->config->item('styleurl')."admin/default/adminstyle.css" ?>" /></head>
     <body>
         <div class='header ui-widget-header'>
         <?php echo $clang->gT("Central Participants Database Summary");?>
@@ -34,7 +34,7 @@
 		</td>
 	</tr>
 	<tr>
-		<th>
+	<th>
             <?php echo $clang->gT("Participants you have shared  ");?>
 		</th>
 		<td>