ydu

Gemfile

@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 gem 'rails', "~> 3.2.16"
 
+gem 'savon', '~> 2.2.0'
+
 gem "brakeman"
 gem 'mime-types'
 
@@ -109,7 +111,7 @@ group :test, :development do
   gem "spork"
   gem "capybara"
   #gem 'rack-mini-profiler'
-  gem "better_errors", "1.1.0"
+  gem "better_errors"
   # gem 'yard'
   # gem "bluecloth"
 end

app/assets/javascripts/admin/filemanager.js

@@ -19,8 +19,8 @@ $(function () {
     'use strict';
     // Initialize the jQuery File Upload widget:
     $('#fileupload').fileupload({
-        maxFileSize: 50000000000,
-        acceptFileTypes: /(\.|\/)(gif|jpe?g|png|pdf|doc|docx|ppt|pptx|xls|xlsx|csv|txt|zip|rar|tar|gz|odt|tiff|key|page)$/i,
+        maxFileSize: 5000000,
+        acceptFileTypes: /(\.|\/)(gif|jpe?g|png|pdf|doc|docx|ppt|pptx|xls|xlsx)$/i,
         dropZone: $('#dropzone'),
         headers:{
             'X-CSRF-Token': $('meta[name="csrf-token"]').attr("content")

app/assets/javascripts/ckeditor/config.js.erb

@@ -28,8 +28,6 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'about' }
 	];
 
-	config.allowedContent = true;
-
 	config.skin = 'moono';
 
 	config.filebrowserBrowseUrl = "<%= Rails.application.routes.url_helpers.admin_assets_path(:module_app_id=>ModuleApp.where(:key=>'asset').first.id) %>";
@@ -37,10 +35,6 @@ CKEDITOR.editorConfig = function( config ) {
 
 	//Font Config
 	config.font_names = 'Arial;Comic Sans MS;Courier New;Georgia;Helvetica;Lucida Sans Unicode;Tahoma;Times New Roman;Trebuchet MS;Verdana;微軟正黑體';
-
-	config.enterMode = CKEDITOR.ENTER_BR;
-	config.shiftEnterMode = CKEDITOR.ENTER_BR;
-	config.pasteFromWordPromptCleanup = true;
 };
 
 CKEDITOR.on('instanceReady',function(){

app/assets/javascripts/lib/ad_banner/banner_preview.js

@@ -32,6 +32,7 @@ function preview() {
             var resize = 500/bannerW
             bannerW = Math.floor(bannerW*resize);
             bannerH = Math.floor(bannerH*resize);
+            console.log(bannerW)
         };
         if(bannerH > 300) {
             var resize = 300/bannerH

app/assets/javascripts/lib/modal-preview.js

@@ -7,12 +7,7 @@ $(function() {
 		for ( instance in CKEDITOR.instances )
           CKEDITOR.instances[instance].updateElement();
         
-		var formData;
-		if(typeof(FormData) == "function"){
-			formData = new FormData( $('form.previewable')[0] );
-		}else{
-			formData = $('form.previewable').serialize()
-		}
+		var formData = new FormData( $('form.previewable')[0] );
 
 		$.ajax({
       type: "post",

app/controllers/admin/ad_banners_controller.rb

@@ -4,7 +4,7 @@ class Admin::AdBannersController < OrbitBackendController
   open_for_sub_manager
 
   def index
-    @ad_banners = get_sorted_and_filtered("ad_banner")
+    @ad_banners = AdBanner.all.page(params[:page]).per(10)
   end
   
   def show

app/controllers/admin/ad_images_controller.rb

@@ -11,7 +11,7 @@ class Admin::AdImagesController < Admin::AdBannersController
   end
 
   def index
-    @ad_images = get_sorted_and_filtered("ad_image")
+    @ad_images = AdImage.all.page(params[:page]).per(10)
   end
 
   def edit

app/controllers/admin/dashboards_controller.rb

@@ -11,7 +11,7 @@ class Admin::DashboardsController < OrbitBackendController
     check_backend_openness
     @module_app_contents, @module_app_contents_total = get_module_app_count('bulletin', 'page_context', 'web_link')
     @recent_updated = get_recently_updated('bulletin', 'page_context', 'web_link')
-    @most_visited = get_most_visited('bulletin', 'page_context')
+    @most_visited = get_most_visited('bulletin', 'page_context','page')
   end
 
   def reload_all_content
@@ -22,7 +22,7 @@ class Admin::DashboardsController < OrbitBackendController
   end
 
   def reload_most_visited
-    @most_visited = get_most_visited('bulletin', 'page_context')
+    @most_visited = get_most_visited('bulletin', 'page_context','page')
     respond_to do |format|
       format.js { render 'reload', locals: {div_id: 'most_visited'} }
     end

app/controllers/application_controller.rb

@@ -321,8 +321,6 @@ class ApplicationController < ActionController::Base
             sorted_objects.flatten!
             sorted_objects.uniq!
             objects = get_with_nil(objects, option, sorted_objects)
-          elsif option.eql?('size')
-            objects = objects.order_by([ [:width, params[:direction]], [:height, params[:direction]] ])
           end
         end
       end
@@ -363,12 +361,7 @@ class ApplicationController < ActionController::Base
     end
 
     if pagination
-      filtered_objects = filter_authorized_objects(objects)
-      if filtered_objects.is_a?(Array)
-        Kaminari.paginate_array(filtered_objects).page(params[:page]).per(10)
-      else
-        filter_authorized_objects(objects).page(params[:page]).per(10)
-      end
+      Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
     else
       filter_authorized_objects(objects)
     end

app/controllers/sessions_controller.rb

@@ -0,0 +1,82 @@
+# encoding: utf-8
+
+class SessionsController < Devise::SessionsController
+	prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
+
+  require 'savon'
+
+  def create 
+
+
+    @SYS_USER = "rulingcom"
+    @SYS_PASS = "pxm87912tkx"
+    @LDAP_USER = params[:user][:user_id]
+    @LDAP_PASS = params[:user][:password]
+
+    if @LDAP_USER == 'rulingcom'
+
+      resource = User.first(conditions:{user_id: @LDAP_USER})
+      
+      if !resource.blank? and resource.valid_password?(@LDAP_PASS)
+
+        resource_name = resource.class.to_s.downcase
+        sign_in(resource_name, resource)
+        redirect_to after_sign_in_path_for(resource)
+
+	  elsif !resource.valid_password?(@LDAP_PASS)
+
+		flash[:error] = "密碼錯誤<br />password Local fail"
+		redirect_to :root
+
+      else
+
+        flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
+        redirect_to :root
+        
+      end
+
+    else
+
+      client = Savon.client(wsdl: 'http://ap.ydu.edu.tw/LDAP_WS/RulingcomDataService.asmx?wsdl',filters: [:SYS_USER, :SYS_PASS, :LDAP_USER, :LDAP_PASS])
+
+      client.operations
+      
+      response = client.call(:login_chk, message: { 
+        "SYS_USER" => @SYS_USER, 
+        "SYS_PASS" =>  @SYS_PASS,
+        "LDAP_USER" => @LDAP_USER, 
+        "LDAP_PASS" => @LDAP_PASS, 
+        "User_IP" => request.remote_ip
+      })
+
+      @datas = response.body[:login_chk_response][:login_chk_result][:string]
+
+      if !@datas[0].blank? and ( @datas[0] == 'P' or @datas[0] == 'U' ) #使用者帳號回傳P，單位帳號回傳U
+
+        resource = User.first(conditions:{user_id: @LDAP_USER})
+        
+        if !resource.blank?
+
+          resource_name = resource.class.to_s.downcase
+          sign_in(resource_name, resource)
+          redirect_to after_sign_in_path_for(resource)
+
+        else #認證通過無帳號不通過
+
+          flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
+          redirect_to :root
+
+        end
+
+
+      else
+        flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
+        redirect_to :root
+      end
+
+    end
+
+  end
+
+
+end

app/helpers/application_helper.rb

@@ -248,24 +248,15 @@ module ApplicationHelper
   end
 
   def get_month_traffic
-    site = Site.first
-    if site.month_traffic_cache.blank? or (site.month_traffic_cache['updated_at'] < (Time.now-1.day) rescue true)
-      site.month_traffic_cache = {}
-
-      site.month_traffic_cache['result'] = []
-      (1..30).each do |i|
-        visits = Impression.where( created_at: {
-          '$gte' => Time.now.beginning_of_day-i.days, 
-          '$lte' => Time.now.end_of_day-i.days}
-          ).count
-        site.month_traffic_cache['result'].push([ Time.now.beginning_of_day-i.days, visits])
-      end
-
-      site.month_traffic_cache['updated_at'] = Time.now
-      site.save
+    result = []
+    (0..30).each do |i|
+      visits = Impression.where( created_at: {
+        '$gte' => Time.now.beginning_of_day-i.days, 
+        '$lte' => Time.now.end_of_day-i.days}
+        ).count
+      result.push([ Time.now.beginning_of_day-i.days, visits])
     end
-    
-    [:name=> t(:visitors_count),:data=>site.month_traffic_cache['result']]
+    [:name=> t(:visitors_count),:data=>result]
   end
 
   # def get_today_traffic

app/mailer/mail_cron_mailer.rb

@@ -63,6 +63,7 @@ class MailCronMailer < ActionMailer::Base
         end 
       end 
 
+
       @mail_cron_log = {  
         :mail_subject => @data.mail_subject,
         :mail_to => group_mail,
@@ -73,16 +74,10 @@ class MailCronMailer < ActionMailer::Base
 
       @mail_cron_log = MailCronLog.new(@mail_cron_log) 
 
+
       @mail_cron_log.save
 
-      @mail_to_count = @data.mail_to.split(',') - group_mail.split(',')
-
-      if @mail_to_count.count == 0
-        @data.destroy
-      else
-        @data.mail_to = @mail_to_count.join(',')
-        @data.save
-      end
+      @data.destroy
 
     end
 

app/models/mail_cron.rb

@@ -38,7 +38,7 @@ class MailCron
 
       if !email_user_id.blank?
 
-        @user = User.find(email_user_id) rescue nil
+        @user = User.find(email_user_id)
 
         @group_mail << @user.email if !@user.blank?
 

app/models/site.rb

@@ -51,8 +51,6 @@ class Site
   field :store_confirmation, :type => Boolean, :default => false
   field :meta_viewport, :type => Boolean, :default => false
 
-  field :month_traffic_cache
-
   belongs_to :design
   has_many :site_metas, :autosave => true, :dependent => :destroy
   validate :in_use_locales, :minimum_enabled_locales

app/models/user/user.rb

@@ -89,7 +89,7 @@ class User
 
   validates :user_id,
             :presence => { :message => I18n.t("users.user_id_not_null") } , 
-            :length => {:minimum => 3, :maximum => 50, :message => I18n.t("users.user_id_length") },
+            :length => {:minimum => 2, :maximum => 50, :message => I18n.t("users.user_id_length") },
             :uniqueness => true
 
   scope :approval_pending, where(:approved => false)

built_in_extensions.rb

@@ -1,6 +1,6 @@
 #built-in-modules
 gem 'archive', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-archive.git'
-gem 'announcement', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-announcement.git'
+gem 'announcement', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-announcement.git', :branch => 'ydu'
 gem 'gallery', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-gallery.git'
 gem 'member', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-member.git'
 gem 'member_staff', '0.0.1', :git => 'http://gitlab.tp.rulingcom.com/root/orbit-memberstaff.git'

config/application.rb

@@ -56,7 +56,6 @@ module Orbit
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', 'modules', '*.{rb,yml}').to_s]
-    config.i18n.enforce_available_locales = false
     config.i18n.default_locale = :zh_tw
 
     # JavaScript files you want as :defaults (application.js is always included).

config/locales/en.yml

@@ -600,7 +600,7 @@ en:
     user_id: User Account
     user_id_note: Should be more than 3 characters and less than 50 characters
     user_id_not_null: User account cannot be null 
-    user_id_length: User account should be more than 3 characters 
+    user_id_length: User account should be more than 2 characters 
     user_id_error: Someone already use that user account 
     user_basic_id_form: Account Info.
     user_basic_data: Personal Profile

config/locales/zh_tw.yml

@@ -600,7 +600,7 @@ zh_tw:
     user_id: 使用者帳號
     user_id_note: 需介於3個字元至50個字元之間
     user_id_not_null: 使用者帳號不能是空值
-    user_id_length: 使用者帳號至少需要3個字元
+    user_id_length: 使用者帳號至少需要2個字元
     user_id_error: 該使用者帳號已被使用
     user_basic_id_form: 帳號資料
     user_basic_data: 個人資料

config/routes.rb

@@ -4,7 +4,7 @@ Orbit::Application.routes.draw do
 
   # get "robots.txt" => 'robots#index'
 
-  devise_for :users, :controllers => { :registrations => "registrations", :passwords => 'passwords', :confirmations => 'confirmations' } do
+  devise_for :users, :controllers => {:sessions => 'sessions', :registrations => "registrations", :passwords => 'passwords', :confirmations => 'confirmations' } do
     resources :passwords, :except => [:index, :show, :destroy]
     match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
   end